Browse Source

Fix unused monster array/MAX_LVLMTYPES (#1686)

pull/876/head
galaxyhaxz 7 years ago committed by GitHub
parent
commit
e668de2bac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      Source/monster.cpp
  2. 7
      Source/monster.h
  3. 4
      defs.h

7
Source/monster.cpp

@ -11,13 +11,12 @@ int nummonsters;
BOOLEAN sgbSaveSoundOn; BOOLEAN sgbSaveSoundOn;
MonsterStruct monster[MAXMONSTERS]; MonsterStruct monster[MAXMONSTERS];
int totalmonsters; int totalmonsters;
CMonster Monsters[MAX_LVLMTYPES];
#ifdef HELLFIRE #ifdef HELLFIRE
CMonster Monsters[24]; int GraphicTable[NUMLEVELS][MAX_LVLMTYPES];
int unused_6AAE30[600];
#else #else
CMonster Monsters[16]; BYTE GraphicTable[NUMLEVELS][MAX_LVLMTYPES];
#endif #endif
// int END_Monsters_17;
int monstimgtot; int monstimgtot;
int uniquetrans; int uniquetrans;
int nummtypes; int nummtypes;

7
Source/monster.h

@ -8,13 +8,12 @@ extern int monstactive[MAXMONSTERS];
extern int nummonsters; extern int nummonsters;
extern MonsterStruct monster[MAXMONSTERS]; extern MonsterStruct monster[MAXMONSTERS];
extern int totalmonsters; extern int totalmonsters;
extern CMonster Monsters[MAX_LVLMTYPES];
#ifdef HELLFIRE #ifdef HELLFIRE
extern CMonster Monsters[24]; extern int GraphicTable[NUMLEVELS][MAX_LVLMTYPES];
extern int unused_6AAE30[600];
#else #else
extern CMonster Monsters[16]; extern BYTE GraphicTable[NUMLEVELS][MAX_LVLMTYPES];
#endif #endif
// int END_Monsters_17;
extern int monstimgtot; extern int monstimgtot;
extern int uniquetrans; extern int uniquetrans;
extern int nummtypes; extern int nummtypes;

4
defs.h

@ -12,7 +12,11 @@
#define MAX_PLRS 4 #define MAX_PLRS 4
#define MAX_CHARACTERS 10 #define MAX_CHARACTERS 10
#ifdef HELLFIRE
#define MAX_LVLMTYPES 24
#else
#define MAX_LVLMTYPES 16 #define MAX_LVLMTYPES 16
#endif
// #define MAX_PATH 260 // #define MAX_PATH 260
#define MAX_SEND_STR_LEN 80 #define MAX_SEND_STR_LEN 80
#define MAX_SPELLS 37 #define MAX_SPELLS 37

Loading…
Cancel
Save