f198b4899d
Removed unnecessary or potentially harmful compiler flags. Added alignment attribute to all old struct members. Removed some unused variables. Made some switch statements handle all or more cases. Removed using declarations in favor of fully qualified names. Fixed a couple of assignments in conditionals that should have been comparisons. Eliminated linker warnings by restoring default linking of standard libraries. Fixed some comparisons between signed and unsigned integers. Note: No testing has been done, in particular of old file I/O. This should be checked for regression caused by alteration of old struct definitions. git-svn-id: http://openexile.googlecode.com/svn/trunk@63 4ebdad44-0ea0-11de-aab3-ff745001d230
104 lines
2.2 KiB
C++
104 lines
2.2 KiB
C++
/*
|
|
* tmpltown.h
|
|
* BoE
|
|
*
|
|
* Created by Celtic Minstrel on 24/04/09.
|
|
*
|
|
*/
|
|
|
|
#ifndef TMPLTOWN_H
|
|
#define TMPLTOWN_H
|
|
|
|
#include <iostream>
|
|
|
|
class cTemplTown {
|
|
public:
|
|
class cCityBlock { // formerly city_block_type
|
|
public:
|
|
short type;
|
|
short destroy_time;
|
|
short alignment;
|
|
short key_time;
|
|
location where;
|
|
};
|
|
class cTerRect { // formerly city_ter_rect_type
|
|
public:
|
|
rectangle rect;
|
|
unsigned short ter_type;
|
|
unsigned char hollow;
|
|
};
|
|
cCityBlock blocks[15];
|
|
cTerRect ter_rects[10];
|
|
void writeTo(std::ostream& file);
|
|
};
|
|
|
|
class cBigTemplTown : public cBigTown, cTemplTown {
|
|
private:
|
|
//cCreature _creatures[60];
|
|
//unsigned short _terrain[64][64];
|
|
//rectangle _room_rect[16];
|
|
//unsigned char _lighting[4][32];
|
|
public:
|
|
unsigned short& terrain(size_t x, size_t y);
|
|
rectangle& room_rect(size_t i);
|
|
cCreature& creatures(size_t i);
|
|
unsigned char& lighting(size_t i, size_t r);
|
|
short max_dim();
|
|
short max_monst();
|
|
void writeTo(std::ostream& file);
|
|
};
|
|
|
|
class cMedTemplTown : public cMedTown, cTemplTown {
|
|
private:
|
|
//cCreature _creatures[40];
|
|
//unsigned short _terrain[48][48];
|
|
//rectangle _room_rect[16];
|
|
//unsigned char _lighting[4][32];
|
|
public:
|
|
unsigned short& terrain(size_t x, size_t y);
|
|
rectangle& room_rect(size_t i);
|
|
cCreature& creatures(size_t i);
|
|
unsigned char& lighting(size_t i, size_t r);
|
|
short max_dim();
|
|
short max_monst();
|
|
void writeTo(std::ostream& file);
|
|
};
|
|
|
|
class cTinyTemplTown : public cTinyTown, cTemplTown {
|
|
private:
|
|
//cCreature _creatures[30];
|
|
//unsigned short _terrain[32][32];
|
|
//rectangle _room_rect[16];
|
|
//unsigned char _lighting[4][32];
|
|
public:
|
|
unsigned short& terrain(size_t x, size_t y);
|
|
rectangle& room_rect(size_t i);
|
|
cCreature& creatures(size_t i);
|
|
unsigned char& lighting(size_t i, size_t r);
|
|
short max_dim();
|
|
short max_monst();
|
|
};
|
|
|
|
// City blocks - I want to figure out how to use these sometime.
|
|
|
|
//struct city_block_type {
|
|
// short block_type;
|
|
// short block_destroy_time;
|
|
// char block_alignment;
|
|
// char block_key_time;
|
|
// location block_loc;
|
|
//};
|
|
//
|
|
//struct city_ter_rect_type {
|
|
// Rect what_rect;
|
|
// unsigned char ter_type;
|
|
// unsigned char hollow;
|
|
//};
|
|
//
|
|
//struct template_town_type {
|
|
// creature_start_type creatures[30];
|
|
// city_block_type city_block[15];
|
|
// city_ter_rect_type city_ter_rect[10];
|
|
//};
|
|
|
|
#endif |