From d004515d6a57059bbd136625856e548c839727ae Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 30 Nov 2020 19:04:23 -0800 Subject: [PATCH] Fix double define --- src/deh_tables.c | 5 +++++ src/deh_tables.h | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/deh_tables.c b/src/deh_tables.c index 1ed385e7b..5733d9b0e 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -25,6 +25,11 @@ #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[] = { 'F', // GRADE_F 'E', // GRADE_E diff --git a/src/deh_tables.h b/src/deh_tables.h index 28e0ad927..2c6b3e204 100644 --- a/src/deh_tables.h +++ b/src/deh_tables.h @@ -20,10 +20,10 @@ // Free slot names // The crazy word-reading stuff uses these. -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. +extern char *FREE_STATES[NUMSTATEFREESLOTS]; +extern char *FREE_MOBJS[NUMMOBJFREESLOTS]; +extern char *FREE_SKINCOLORS[NUMCOLORFREESLOTS]; +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() {\ memset(FREE_STATES,0,sizeof(char *) * NUMSTATEFREESLOTS);\