lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'luacolors-gcc10-fix' into 'next' 

Fix the "Custom skincolors" branch not compiling with GCC 10.

See merge request STJr/SRB2!966
This commit is contained in:
LJ Sonic 2020-05-29 11:23:54 -04:00
parent 755e9d659d 71cf31fcaf
commit b7c5163419
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/d_main.c
View File

@ -125,6 +125,9 @@ boolean advancedemo;
INT32 debugload = 0;
#endif
UINT16 numskincolors;
menucolor_t *menucolorhead, *menucolortail;
char savegamename[256];
char srb2home[256] = ".";
@ -1190,7 +1193,7 @@ void D_SRB2Main(void)
if (M_CheckParm("-password") && M_IsNextParm())
D_SetPassword(M_GetNextParm());
// player setup menu colors must be initialized before
// any wad file is added, as they may contain colors themselves
M_InitPlayerSetupColors();

2
src/doomdef.h
View File

@ -396,7 +396,7 @@ typedef enum
NUMSUPERCOLORS = ((SKINCOLOR_FIRSTFREESLOT - FIRSTSUPERCOLOR)/5)
} skincolornum_t;
UINT16 numskincolors;
extern UINT16 numskincolors;
extern skincolor_t skincolors[MAXSKINCOLORS];

2
src/m_menu.h
View File

@ -450,7 +450,7 @@ typedef struct menucolor_s {
UINT16 color;
} menucolor_t;
menucolor_t *menucolorhead, *menucolortail;
extern menucolor_t *menucolorhead, *menucolortail;
void M_AddMenuColor(UINT16 color);
void M_MoveColorBefore(UINT16 color, UINT16 targ);