From 73e18b9ccddb9d849c9ee9da2684940ccf06c136 Mon Sep 17 00:00:00 2001
From: Logan Aerl Arias <logana@srb2.org>
Date: Sun, 18 Feb 2024 18:37:43 -0500
Subject: [PATCH] flags of the skin_t struct should be accessed via a pointer
flags of the skin_t struct should be accessed via a pointer
---
src/m_menu.c | 5 ++---
src/r_skins.c | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/m_menu.c b/src/m_menu.c
index 305ec18057..406e0891af 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 40f62bdc4f..5c070fba48 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;
--
GitLab