From f0ef4e3193b94553eebbc8158b43cfebbc51c24e Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Tue, 24 Dec 2019 18:31:47 -0500
Subject: [PATCH] Fix edge case with R_SkinUsable
---
src/r_things.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/r_things.c b/src/r_things.c
index aa2a73515..a4bc14c02 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -2839,7 +2839,7 @@ boolean R_SkinUsable(INT32 playernum, INT32 skinnum)
{
return ((skinnum == -1) // Simplifies things elsewhere, since there's already plenty of checks for less-than-0...
|| (!skins[skinnum].availability)
- || ((playernum != -1) ? (players[playernum].availabilities & (1 << skinnum)) : (unlockables[skins[skinnum].availability - 1].unlocked))
+ || (((netgame || multiplayer) && playernum != -1) ? (players[playernum].availabilities & (1 << skinnum)) : (unlockables[skins[skinnum].availability - 1].unlocked))
|| (modeattacking) // If you have someone else's run you might as well take a look
|| (Playing() && (R_SkinAvailable(mapheaderinfo[gamemap-1]->forcecharacter) == skinnum)) // Force 1.
|| (netgame && (cv_forceskin.value == skinnum)) // Force 2.
--
GitLab