fix some skinnumber bound checks

gotta stay within "numskins" now instead of maxskins
This commit is contained in:
alufolie91 committed 2026-10-16 15:20:31 +02:00
1 parent e8513333cd
commit 971eb871da
5 files changed
+13 -5

No files matched your search

+3 -1
View File
@@ -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);
+2
View File
@@ -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
+2
View File
@@ -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
{
+3 -3
View File
@@ -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;
+3 -1
View File
@@ -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)