comparison Monsters.h @ 770:02bfc82f429c

Слияние
author Ritor1
date Sat, 23 Mar 2013 09:26:07 +0600
parents 6005142abce0
children 4a00901e063c
comparison
equal deleted inserted replaced
769:2f40f4b35ce0 770:02bfc82f429c
156 #pragma pack(push, 1) 156 #pragma pack(push, 1)
157 struct MonsterStats 157 struct MonsterStats
158 { 158 {
159 void Initialize(); 159 void Initialize();
160 void InitializePlacements(); 160 void InitializePlacements();
161 signed int FindMonsterByName(const char *Str2); 161 signed int FindMonsterByTextureName(const char *Str2);
162 162
163 static bool BelongsToSupertype(unsigned int uMonsterInfoID, enum MONSTER_SUPERTYPE eSupertype); 163 static bool BelongsToSupertype(unsigned int uMonsterInfoID, enum MONSTER_SUPERTYPE eSupertype);
164 164
165 MonsterInfo pInfos[265]; //0 - 5b18h 165 MonsterInfo pInfos[265]; //0 - 5b18h
166 char *pPlaceStrings[31]; //5B18h placement counts from 1 166 char *pPlaceStrings[31]; //5B18h placement counts from 1
191 struct MonsterList 191 struct MonsterList
192 { 192 {
193 inline MonsterList(): //----- (00458429) 193 inline MonsterList(): //----- (00458429)
194 uNumMonsters(0), pMonsters(nullptr) 194 uNumMonsters(0), pMonsters(nullptr)
195 {} 195 {}
196 unsigned __int16 GetMonsterByName(const char *pMonsterName); 196 signed __int16 GetMonsterIDByName(const char *pMonsterName);
197 void ToFile(); 197 void ToFile();
198 void FromFile(void *pSerialized); 198 void FromFile(void *pSerialized);
199 bool FromFileTxt(const char *Args); 199 bool FromFileTxt(const char *Args);
200 200
201 unsigned int uNumMonsters; 201 signed int uNumMonsters;
202 struct MonsterDesc *pMonsters; 202 struct MonsterDesc *pMonsters;
203 }; 203 };
204 #pragma pack(pop) 204 #pragma pack(pop)
205 205
206 206