diff --git a/src/m_menu.c b/src/m_menu.c index 305ec1805728c1b934447cbd599546ebe7ee7762..406e0891aff86d737b67a4cf10b2284783fdec2e 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -8866,7 +8866,6 @@ static void M_ReadSavegameInfo(UINT32 slot) { strlcpy(savegameinfo[slot].levelname, mapheaderinfo[(fake-1) & 8191]->lvlttl, 15); strcat(savegameinfo[slot].levelname, "..."); - } savegameinfo[slot].gamemap = fake; @@ -12562,7 +12561,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice) if (setupm_fakeskin < 0) setupm_fakeskin = numskins-1; } - while ((prev_setupm_fakeskin != setupm_fakeskin) && (!(R_SkinUsable(-1, setupm_fakeskin)) || (skins[setupm_fakeskin].flags & SF_NOMULTIPLAYER))); + while ((prev_setupm_fakeskin != setupm_fakeskin) && (!(R_SkinUsable(-1, setupm_fakeskin)) || (skins[setupm_fakeskin]->flags & SF_NOMULTIPLAYER))); multi_spr2 = P_GetSkinSprite2(skins[setupm_fakeskin], SPR2_WALK, NULL); } else if (itemOn == 2) // player color @@ -12602,7 +12601,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice) if (setupm_fakeskin > numskins-1) setupm_fakeskin = 0; } - while ((prev_setupm_fakeskin != setupm_fakeskin) && (!(R_SkinUsable(-1, setupm_fakeskin)) || (skins[setupm_fakeskin].flags & SF_NOMULTIPLAYER))); + while ((prev_setupm_fakeskin != setupm_fakeskin) && (!(R_SkinUsable(-1, setupm_fakeskin)) || (skins[setupm_fakeskin]->flags & SF_NOMULTIPLAYER))); multi_spr2 = P_GetSkinSprite2(skins[setupm_fakeskin], SPR2_WALK, NULL); } else if (itemOn == 2) // player color diff --git a/src/r_skins.c b/src/r_skins.c index 40f62bdc4f8fe659ba55f310bab71096ad6db8b2..5c070fba489bb0fecc10cd72e855a70943799d7b 100644 --- a/src/r_skins.c +++ b/src/r_skins.c @@ -238,7 +238,7 @@ boolean R_SkinUsable(INT32 playernum, INT32 skinnum) return true; } - if ((netgame || multiplayer) && (skins[skinnum].flags & SF_NOMULTIPLAYER)) + if ((netgame || multiplayer) && (skins[skinnum]->flags & SF_NOMULTIPLAYER)) { // Disable return false;