From 971eb871da24c73ea7460ed8563bc18027daaf03 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 16 Oct 2026 15:03:48 +0200 Subject: [PATCH] fix some skinnumber bound checks gotta stay within "numskins" now instead of maxskins --- src/hardware/hw_md2.c | 4 +++- src/lua_baselib.c | 2 ++ src/lua_hudlib.c | 2 ++ src/m_menu.c | 6 +++--- src/r_skins.c | 4 +++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 66e84c9ee..b8bcfa332 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1311,6 +1311,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr) && gpatch->width == blendgpatch->width && gpatch->height == blendgpatch->height) { INT32 tcskinnum = TC_DEFAULT; + if ((spr->mobj->flags & MF_BOSS) && (spr->mobj->flags2 & MF2_FRET) && (leveltime & 1)) // Bosses "flash" { if (spr->mobj->type == MT_CYBRAKDEMON) @@ -1333,7 +1334,8 @@ void HWR_DrawMD2(gl_vissprite_t *spr) tcskinnum = (INT32)R_GetMobjSkinNum(spr->mobj); } } - else tcskinnum = TC_DEFAULT; + else + tcskinnum = TC_DEFAULT; } HWR_GetBlendedTexture(gpatch, blendgpatch, tcskinnum, spr->colormap, (skincolors_t)spr->mobj->color); diff --git a/src/lua_baselib.c b/src/lua_baselib.c index 02dead2d4..d93a65fba 100644 --- a/src/lua_baselib.c +++ b/src/lua_baselib.c @@ -1766,6 +1766,8 @@ static int lib_rSetPlayerSkin(lua_State *L) INT32 i = luaL_checkinteger(L, 2); if (i < 0 || i >= MAXSKINS) return luaL_error(L, "skin number (argument #2) %d out of range (0 - %d)", i, MAXSKINS-1); + if (i >= numskins) + return 0; SetPlayerSkinByNum(player-players, i); } else // skin name diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c index 037f9adba..1785a7ed3 100644 --- a/src/lua_hudlib.c +++ b/src/lua_hudlib.c @@ -1056,6 +1056,8 @@ static int libd_getColormap(lua_State *L) skinnum = (INT32)luaL_checkinteger(L, 1); if (skinnum < TC_BLINK || skinnum >= MAXSKINS) return luaL_error(L, "skin number %d is out of range (%d - %d)", skinnum, TC_BLINK, MAXSKINS-1); + if (skinnum >= numskins) + return 0; } else // skin name { diff --git a/src/m_menu.c b/src/m_menu.c index 844824545..9630d3354 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -7709,7 +7709,7 @@ static void M_DrawMPMainMenu(void) break; } - if (pskin >= MAXSKINS) + if (pskin >= numskins) pskin = 0; if (!trans && i > cv_splitplayers.value) @@ -8509,12 +8509,12 @@ static void M_DrawSetupMultiPlayerMenu(void) break; } - if (skintodisplay >= MAXSKINS) + if (skintodisplay >= numskins) skintodisplay = 0; skinnum = R_SkinAvailable(skins[skintodisplay]->name); - if (skinnum < 0 || skinnum >= MAXSKINS) + if (skinnum < 0 || skinnum >= numskins) skinnum = 0; sprdef = &skins[skinnum]->spritedef; diff --git a/src/r_skins.c b/src/r_skins.c index 522aef643..abb0b1898 100644 --- a/src/r_skins.c +++ b/src/r_skins.c @@ -310,10 +310,12 @@ setcvar: void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum) { player_t *player = &players[playernum]; - skin_t *skin = skins[skinnum]; + skin_t *skin; if (skinnum >= 0 && skinnum < numskins) // Make sure it exists! { + skin = skins[skinnum]; + player->skin = skinnum; if (player->mo)