Fix double define
This commit is contained in:
parent
eef3028110
commit
d004515d6a
|
@ -25,6 +25,11 @@
|
||||||
|
|
||||||
#include "deh_tables.h"
|
#include "deh_tables.h"
|
||||||
|
|
||||||
|
char *FREE_STATES[NUMSTATEFREESLOTS];
|
||||||
|
char *FREE_MOBJS[NUMMOBJFREESLOTS];
|
||||||
|
char *FREE_SKINCOLORS[NUMCOLORFREESLOTS];
|
||||||
|
UINT8 used_spr[(NUMSPRITEFREESLOTS / 8) + 1]; // Bitwise flag for sprite freeslot in use! I would use ceil() here if I could, but it only saves 1 byte of memory anyway.
|
||||||
|
|
||||||
const char NIGHTSGRADE_LIST[] = {
|
const char NIGHTSGRADE_LIST[] = {
|
||||||
'F', // GRADE_F
|
'F', // GRADE_F
|
||||||
'E', // GRADE_E
|
'E', // GRADE_E
|
||||||
|
|
|
@ -20,10 +20,10 @@
|
||||||
|
|
||||||
// Free slot names
|
// Free slot names
|
||||||
// The crazy word-reading stuff uses these.
|
// The crazy word-reading stuff uses these.
|
||||||
char *FREE_STATES[NUMSTATEFREESLOTS];
|
extern char *FREE_STATES[NUMSTATEFREESLOTS];
|
||||||
char *FREE_MOBJS[NUMMOBJFREESLOTS];
|
extern char *FREE_MOBJS[NUMMOBJFREESLOTS];
|
||||||
char *FREE_SKINCOLORS[NUMCOLORFREESLOTS];
|
extern char *FREE_SKINCOLORS[NUMCOLORFREESLOTS];
|
||||||
UINT8 used_spr[(NUMSPRITEFREESLOTS / 8) + 1]; // Bitwise flag for sprite freeslot in use! I would use ceil() here if I could, but it only saves 1 byte of memory anyway.
|
extern UINT8 used_spr[(NUMSPRITEFREESLOTS / 8) + 1]; // Bitwise flag for sprite freeslot in use! I would use ceil() here if I could, but it only saves 1 byte of memory anyway.
|
||||||
|
|
||||||
#define initfreeslots() {\
|
#define initfreeslots() {\
|
||||||
memset(FREE_STATES,0,sizeof(char *) * NUMSTATEFREESLOTS);\
|
memset(FREE_STATES,0,sizeof(char *) * NUMSTATEFREESLOTS);\
|
||||||
|
|
Loading…
Reference in a new issue