Mercurial > mm7
diff Monsters.h @ 770:02bfc82f429c
Слияние
author | Ritor1 |
---|---|
date | Sat, 23 Mar 2013 09:26:07 +0600 |
parents | 6005142abce0 |
children | 4a00901e063c |
line wrap: on
line diff
--- a/Monsters.h Sat Mar 23 09:25:31 2013 +0600 +++ b/Monsters.h Sat Mar 23 09:26:07 2013 +0600 @@ -158,7 +158,7 @@ { void Initialize(); void InitializePlacements(); - signed int FindMonsterByName(const char *Str2); + signed int FindMonsterByTextureName(const char *Str2); static bool BelongsToSupertype(unsigned int uMonsterInfoID, enum MONSTER_SUPERTYPE eSupertype); @@ -193,12 +193,12 @@ inline MonsterList(): //----- (00458429) uNumMonsters(0), pMonsters(nullptr) {} - unsigned __int16 GetMonsterByName(const char *pMonsterName); + signed __int16 GetMonsterIDByName(const char *pMonsterName); void ToFile(); void FromFile(void *pSerialized); bool FromFileTxt(const char *Args); - unsigned int uNumMonsters; + signed int uNumMonsters; struct MonsterDesc *pMonsters; }; #pragma pack(pop)