From e668de2bac73f466eb9c8d4e097cfce1df9911d4 Mon Sep 17 00:00:00 2001 From: galaxyhaxz Date: Wed, 18 Sep 2019 16:23:59 -0500 Subject: [PATCH] Fix unused monster array/MAX_LVLMTYPES (#1686) --- Source/monster.cpp | 7 +++---- Source/monster.h | 7 +++---- defs.h | 4 ++++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Source/monster.cpp b/Source/monster.cpp index 6e0b94515..b2c94abf5 100644 --- a/Source/monster.cpp +++ b/Source/monster.cpp @@ -11,13 +11,12 @@ int nummonsters; BOOLEAN sgbSaveSoundOn; MonsterStruct monster[MAXMONSTERS]; int totalmonsters; +CMonster Monsters[MAX_LVLMTYPES]; #ifdef HELLFIRE -CMonster Monsters[24]; -int unused_6AAE30[600]; +int GraphicTable[NUMLEVELS][MAX_LVLMTYPES]; #else -CMonster Monsters[16]; +BYTE GraphicTable[NUMLEVELS][MAX_LVLMTYPES]; #endif -// int END_Monsters_17; int monstimgtot; int uniquetrans; int nummtypes; diff --git a/Source/monster.h b/Source/monster.h index 1828209ea..46d2d7ae7 100644 --- a/Source/monster.h +++ b/Source/monster.h @@ -8,13 +8,12 @@ extern int monstactive[MAXMONSTERS]; extern int nummonsters; extern MonsterStruct monster[MAXMONSTERS]; extern int totalmonsters; +extern CMonster Monsters[MAX_LVLMTYPES]; #ifdef HELLFIRE -extern CMonster Monsters[24]; -extern int unused_6AAE30[600]; +extern int GraphicTable[NUMLEVELS][MAX_LVLMTYPES]; #else -extern CMonster Monsters[16]; +extern BYTE GraphicTable[NUMLEVELS][MAX_LVLMTYPES]; #endif -// int END_Monsters_17; extern int monstimgtot; extern int uniquetrans; extern int nummtypes; diff --git a/defs.h b/defs.h index 98aa87a63..3e9b560bc 100644 --- a/defs.h +++ b/defs.h @@ -12,7 +12,11 @@ #define MAX_PLRS 4 #define MAX_CHARACTERS 10 +#ifdef HELLFIRE +#define MAX_LVLMTYPES 24 +#else #define MAX_LVLMTYPES 16 +#endif // #define MAX_PATH 260 #define MAX_SEND_STR_LEN 80 #define MAX_SPELLS 37