Mercurial > mm7
comparison Outdoor.h @ 763:a84db04439a4
Merge
author | Nomad |
---|---|
date | Sat, 23 Mar 2013 19:47:18 +0200 |
parents | cf2fbac6edc9 7f1487b74571 |
children | 777c42590ffc 45615cacad31 |
comparison
equal
deleted
inserted
replaced
762:cf2fbac6edc9 | 763:a84db04439a4 |
---|---|
3 #include "OutdoorCamera.h" | 3 #include "OutdoorCamera.h" |
4 #include "Indoor.h" | 4 #include "Indoor.h" |
5 #include "TileFrameTable.h" | 5 #include "TileFrameTable.h" |
6 | 6 |
7 | 7 |
8 | |
9 /* 256 */ | 8 /* 256 */ |
10 #pragma pack(push, 1) | 9 #pragma pack(push, 1) |
11 struct ODMHeader | 10 struct ODMHeader |
12 { | 11 { |
13 int uVersion; | 12 int uVersion; |
26 Tileset tileset; | 25 Tileset tileset; |
27 unsigned __int16 uTileID; | 26 unsigned __int16 uTileID; |
28 }; | 27 }; |
29 #pragma pack(pop) | 28 #pragma pack(pop) |
30 | 29 |
31 | 30 #pragma pack(push, 1) |
32 | 31 struct DMap |
32 { | |
33 unsigned __int8 field0; | |
34 unsigned __int8 field1; | |
35 }; | |
36 #pragma pack(pop) | |
33 | 37 |
34 /* 79 */ | 38 /* 79 */ |
35 #pragma pack(push, 1) | 39 #pragma pack(push, 1) |
36 struct OutdoorLocationTerrain | 40 struct OutdoorLocationTerrain |
37 { | 41 { |
38 //----- (0047C794) -------------------------------------------------------- | 42 //----- (0047C794) -------------------------------------------------------- |
39 inline OutdoorLocationTerrain() | 43 inline OutdoorLocationTerrain() |
40 { | 44 { |
41 this->pHeightmap = 0; | 45 pHeightmap = NULL; |
42 this->pTilemap = 0; | 46 pTilemap = NULL; |
43 this->ptr_C = 0; | 47 pAttributemap = NULL; |
48 pDmap = NULL;; | |
44 this->field_10 = 0; | 49 this->field_10 = 0; |
45 this->field_12 = 0; | 50 this->field_12 = 0; |
46 | 51 |
47 pAttributemap = nullptr; | 52 |
48 } | 53 } |
49 | 54 |
50 void _47C7A9(); | 55 void _47C7A9(); |
51 void Release(); | 56 void Release(); |
52 int _47C80A(int a2, int a3, int a4, int a5); | 57 void FillDMap(int X, int Y, int W, int Z); |
53 int _47CB57(int a1, int a2, int a3); | 58 int _47CB57(int a1, int a2, int a3); |
54 bool ZeroLandscape(); | 59 bool ZeroLandscape(); |
55 bool Initialize(); | 60 bool Initialize(); |
56 | 61 |
57 | 62 |
58 unsigned __int8 *pHeightmap; | 63 unsigned __int8 *pHeightmap; |
59 unsigned __int8 *pTilemap; | 64 unsigned __int8 *pTilemap; |
60 unsigned __int8 *pAttributemap; | 65 unsigned __int8 *pAttributemap; |
61 void *ptr_C; | 66 struct DMap *pDmap; |
62 __int16 field_10; | 67 __int16 field_10; |
63 __int16 field_12; | 68 __int16 field_12; |
64 __int16 field_14; | 69 __int16 field_14; |
65 __int16 field_16; | 70 __int16 field_16; |
66 int field_18; | 71 int field_18; |
136 field_F0 = 0; | 141 field_F0 = 0; |
137 field_F4 = 0x40000000u; | 142 field_F4 = 0x40000000u; |
138 //DLVHeader::DLVHeader(&v1->ddm); | 143 //DLVHeader::DLVHeader(&v1->ddm); |
139 pSpawnPoints = 0; | 144 pSpawnPoints = 0; |
140 pBModels = 0; | 145 pBModels = 0; |
141 ptr_D4 = 0; | 146 pCmap = 0; |
142 pFaceIDLIST = 0; | 147 pFaceIDLIST = 0; |
143 pOMAP = 0; | 148 pOMAP = 0; |
144 } | 149 } |
145 | 150 |
146 void ExecDraw(unsigned int bRedraw); | 151 void ExecDraw(unsigned int bRedraw); |
184 char pSkyTextureName[32]; | 189 char pSkyTextureName[32]; |
185 char pGroundTileset[32]; | 190 char pGroundTileset[32]; |
186 OutdoorLocationTileType pTileTypes[4]; // [3] road tileset | 191 OutdoorLocationTileType pTileTypes[4]; // [3] road tileset |
187 unsigned int uNumBModels; | 192 unsigned int uNumBModels; |
188 struct OutdoorLocationTerrain pTerrain; | 193 struct OutdoorLocationTerrain pTerrain; |
189 void *ptr_D4; | 194 void *pCmap; |
190 struct BSPModel *pBModels; | 195 struct BSPModel *pBModels; |
191 unsigned int numFaceIDListElems; | 196 unsigned int numFaceIDListElems; |
192 unsigned __int16 *pFaceIDLIST; | 197 unsigned __int16 *pFaceIDLIST; |
193 unsigned int *pOMAP; | 198 unsigned int *pOMAP; |
194 unsigned int uSky_TextureID; | 199 unsigned int uSky_TextureID; |
199 char field_F8[968]; | 204 char field_F8[968]; |
200 unsigned int uNumSpawnPoints; | 205 unsigned int uNumSpawnPoints; |
201 struct SpawnPointMM7 *pSpawnPoints; | 206 struct SpawnPointMM7 *pSpawnPoints; |
202 struct DDM_DLV_Header ddm; | 207 struct DDM_DLV_Header ddm; |
203 unsigned __int64 uLastVisitDay; | 208 unsigned __int64 uLastVisitDay; |
204 char field_4F8[12]; | 209 char sky_texture_name[12]; |
205 int day_attrib; | 210 int day_attrib; |
206 int day_fogrange_1; | 211 int day_fogrange_1; |
207 int day_fogrange_2; | 212 int day_fogrange_2; |
208 char field_510[24]; | 213 char field_510[24]; |
209 unsigned char uUndiscoveredArea[88][11];//968 | 214 unsigned char uUndiscoveredArea[88][11];//968 |