From 20cdb1c5ec93aaecbc8d98adfdb6601838275853 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 20 Jun 2024 02:42:49 +0200 Subject: [PATCH] limit localskins to 32 hope this doesent just die lol --- src/doomdef.h | 1 + src/hardware/hw_md2.c | 6 ++++-- src/hardware/hw_md2.h | 2 +- src/r_draw.c | 2 +- src/r_things.c | 14 ++++++++++---- src/r_things.h | 4 ++-- src/st_stuff.c | 12 ++++++------ src/st_stuff.h | 12 ++++++------ 8 files changed, 31 insertions(+), 22 deletions(-) diff --git a/src/doomdef.h b/src/doomdef.h index e4a314d22..d27f06609 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -206,6 +206,7 @@ extern char logfilename[1024]; #define MAXPLAYERS 16 #define MAXSKINS 255 +#define MAXLOCALSKINS 32 #define PLAYERSMASK (MAXPLAYERS-1) #define MAXPLAYERNAME 21 diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 5818f01b2..0b43095da 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -75,7 +75,7 @@ md2_t md2_models[NUMSPRITES]; md2_t md2_playermodels[MAXSKINS]; -md2_t md2_localplayermodels[MAXSKINS]; +md2_t md2_localplayermodels[MAXLOCALSKINS]; /* @@ -494,7 +494,9 @@ void HWR_InitMD2(void) md2_playermodels[s].skin = -1; md2_playermodels[s].notfound = true; md2_playermodels[s].error = false; - + } + for (s = 0; s < MAXLOCALSKINS; s++) + { md2_localplayermodels[s].scale = -1.0f; md2_localplayermodels[s].model = NULL; md2_localplayermodels[s].grpatch = NULL; diff --git a/src/hardware/hw_md2.h b/src/hardware/hw_md2.h index a6f06428e..7b58a6f97 100644 --- a/src/hardware/hw_md2.h +++ b/src/hardware/hw_md2.h @@ -37,7 +37,7 @@ typedef struct extern md2_t md2_models[NUMSPRITES]; extern md2_t md2_playermodels[MAXSKINS]; -extern md2_t md2_localplayermodels[MAXSKINS]; +extern md2_t md2_localplayermodels[MAXLOCALSKINS]; void HWR_InitMD2(void); void HWR_DrawMD2(gr_vissprite_t *spr); diff --git a/src/r_draw.c b/src/r_draw.c index eab7b68cf..182cabc21 100644 --- a/src/r_draw.c +++ b/src/r_draw.c @@ -119,7 +119,7 @@ INT32 *tiltlighting; #define NUM_PALETTE_ENTRIES 256 static UINT8** translationtablecache[TT_CACHE_SIZE] = {NULL}; -static UINT8** localtranslationtablecache[MAXSKINS] = {NULL}; +static UINT8** localtranslationtablecache[MAXLOCALSKINS] = {NULL}; // See also the enum skincolors_t diff --git a/src/r_things.c b/src/r_things.c index b8aed611d..e1c11429b 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -2960,14 +2960,14 @@ UINT8 skinstatscount[9][9] = { {0, 0, 0, 0, 0, 0, 0, 0, 0} }; UINT8 skinsorted[MAXSKINS]; -skin_t localskins[MAXSKINS]; -skin_t allskins[MAXSKINS*2]; +skin_t localskins[MAXLOCALSKINS]; +skin_t allskins[MAXSKINS+MAXLOCALSKINS]; // FIXTHIS: don't work because it must be inistilised before the config load //#define SKINVALUES #ifdef SKINVALUES CV_PossibleValue_t skin_cons_t[MAXSKINS+1]; -CV_PossibleValue_t localskin_cons_t[MAXSKINS+1]; +CV_PossibleValue_t localskin_cons_t[MAXLOCALSKINS+1]; #endif static void Sk_SetDefaultValue(skin_t *skin, boolean local) @@ -3407,11 +3407,17 @@ void R_AddSkins(UINT16 wadnum, boolean local) // advance by default lastlump = lump + 1; - if (( (local) ? numlocalskins : numskins ) >= MAXSKINS) + if (numskins >= MAXSKINS) { CONS_Alert(CONS_WARNING, M_GetText("Unable to add skin, too many characters are loaded (%d maximum)\n"), MAXSKINS); continue; // so we know how many skins couldn't be added } + if (numlocalskins >= MAXLOCALSKINS) + { + CONS_Alert(CONS_WARNING, M_GetText("Unable to add localskin, too many localskins are loaded (%d maximum)\n"), MAXLOCALSKINS); + continue; // so we know how many skins couldn't be added + } + buf = W_CacheLumpNumPwad(wadnum, lump, PU_CACHE); size = W_LumpLengthPwad(wadnum, lump); diff --git a/src/r_things.h b/src/r_things.h index 928835a48..348601208 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -221,8 +221,8 @@ extern UINT8 skinstatscount[9][9]; extern UINT8 skinsorted[MAXSKINS]; void sortSkinGrid(void); -extern skin_t localskins[MAXSKINS]; -extern skin_t allskins[MAXSKINS*2]; +extern skin_t localskins[MAXLOCALSKINS]; +extern skin_t allskins[MAXSKINS+MAXLOCALSKINS]; boolean SetPlayerSkin(INT32 playernum,const char *skinname); void SetPlayerSkinByNum(INT32 playernum,INT32 skinnum); // Tails 03-16-2002 diff --git a/src/st_stuff.c b/src/st_stuff.c index 3e64e6626..b78f47519 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -56,17 +56,17 @@ patch_t *facerankprefix[MAXSKINS]; // ranking patch_t *facewantprefix[MAXSKINS]; // wanted patch_t *facemmapprefix[MAXSKINS]; // minimap -patch_t *localfacerankprefix[MAXSKINS]; // ranking -patch_t *localfacewantprefix[MAXSKINS]; // wanted -patch_t *localfacemmapprefix[MAXSKINS]; // minimap +patch_t *localfacerankprefix[MAXLOCALSKINS]; // ranking +patch_t *localfacewantprefix[MAXLOCALSKINS]; // wanted +patch_t *localfacemmapprefix[MAXLOCALSKINS]; // minimap char *facerankprefix_name[MAXSKINS]; // ranking char *facewantprefix_name[MAXSKINS]; // wanted char *facemmapprefix_name[MAXSKINS]; // minimap -char *localfacerankprefix_name[MAXSKINS]; // ranking -char *localfacewantprefix_name[MAXSKINS]; // wanted -char *localfacemmapprefix_name[MAXSKINS]; // minimap +char *localfacerankprefix_name[MAXLOCALSKINS]; // ranking +char *localfacewantprefix_name[MAXLOCALSKINS]; // wanted +char *localfacemmapprefix_name[MAXLOCALSKINS]; // minimap // ------------------------------------------ // status bar overlay diff --git a/src/st_stuff.h b/src/st_stuff.h index 46fcc4d67..0c3258d01 100644 --- a/src/st_stuff.h +++ b/src/st_stuff.h @@ -78,15 +78,15 @@ extern patch_t *sboperiod; extern patch_t *facerankprefix[MAXSKINS]; // ranking extern patch_t *facewantprefix[MAXSKINS]; // wanted extern patch_t *facemmapprefix[MAXSKINS]; // minimap -extern patch_t *localfacerankprefix[MAXSKINS]; // ranking -extern patch_t *localfacewantprefix[MAXSKINS]; // wanted -extern patch_t *localfacemmapprefix[MAXSKINS]; // minimap +extern patch_t *localfacerankprefix[MAXLOCALSKINS]; // ranking +extern patch_t *localfacewantprefix[MAXLOCALSKINS]; // wanted +extern patch_t *localfacemmapprefix[MAXLOCALSKINS]; // minimap extern char *facerankprefix_name[MAXSKINS]; // ranking extern char *facewantprefix_name[MAXSKINS]; // wanted extern char *facemmapprefix_name[MAXSKINS]; // minimap -extern char *localfacerankprefix_name[MAXSKINS]; // ranking -extern char *localfacewantprefix_name[MAXSKINS]; // wanted -extern char *localfacemmapprefix_name[MAXSKINS]; // minimap +extern char *localfacerankprefix_name[MAXLOCALSKINS]; // ranking +extern char *localfacewantprefix_name[MAXLOCALSKINS]; // wanted +extern char *localfacemmapprefix_name[MAXLOCALSKINS]; // minimap extern patch_t *livesback; extern patch_t *ngradeletters[7];