comparison TileFrameTable.h @ 633:f6aeea3eb893

Слияние
author Ritor1
date Mon, 11 Mar 2013 09:28:57 +0600
parents 1b813023fcbd
children 7f1487b74571
comparison
equal deleted inserted replaced
632:f234b67a9caf 633:f6aeea3eb893
19 TILE_DESC_SCROLL_LEFT = 0x1000, 19 TILE_DESC_SCROLL_LEFT = 0x1000,
20 TILE_DESC_SCROLL_RIGHT = 0x2000, 20 TILE_DESC_SCROLL_RIGHT = 0x2000,
21 }; 21 };
22 22
23 23
24 enum Tileset: unsigned __int16
25 {
26 Tileset_Grass = 0,
27 Tileset_Snow = 1,
28 Tileset_2 = 2,
29 Tileset_3 = 3,
30 Tileset_Dirt = 4,
31 Tileset_Water = 5,
32 Tileset_6 = 6,
33 Tileset_Swamp = 7,
34 Tileset_8 = 8,
35 Tileset_9 = 9,
36 Tileset_RoadGrassCobble = 10
37 };
24 38
25 /* 48 */ 39 /* 48 */
26 #pragma pack(push, 1) 40 #pragma pack(push, 1)
27 struct TileDesc 41 struct TileDesc
28 { 42 {
29 char pTileName[16]; 43 char pTileName[16];
30 unsigned __int16 uTileID; 44 unsigned __int16 uTileID;
31 unsigned __int16 uBitmapID; 45 unsigned __int16 uBitmapID;
32 unsigned __int16 uTerrainType; 46 Tileset tileset;
33 unsigned __int16 uSection; 47 unsigned __int16 uSection;
34 unsigned __int16 uAttributes; 48 unsigned __int16 uAttributes;
35 }; 49 };
36 #pragma pack(pop) 50 #pragma pack(pop)
37 51
46 this->uNumTiles = 0; 60 this->uNumTiles = 0;
47 } 61 }
48 ~TileTable(); 62 ~TileTable();
49 63
50 TileDesc *GetTileById(unsigned int uTileID); 64 TileDesc *GetTileById(unsigned int uTileID);
51 void InitializeTileset(int uTerrainType); 65 void InitializeTileset(Tileset tileset);
52 int method_487ED6(signed int a1, int a2); 66 int method_487ED6(signed int a1, int a2);
53 unsigned int GetTileId(unsigned int uTerrainType, unsigned int uSection); 67 unsigned int GetTileId(unsigned int uTerrainType, unsigned int uSection);
54 void ToFile(); 68 void ToFile();
55 void FromFile(void *pSerialized); 69 void FromFile(void *pSerialized);
56 int FromFileTxt(const char *pFilename); 70 int FromFileTxt(const char *pFilename);