lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplification of the hide check after discussion with Rob.

Browse source
This commit is contained in:
toasterbabe 2016-07-13 19:10:31 +01:00
parent 824458a5ff
commit a108fcce5b
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/r_things.c
View file

@ -2312,7 +2312,7 @@ static void Sk_SetDefaultValue(skin_t *skin)
skin->highresscale = FRACUNIT>>1;
skin->availability = 2;
skin->availability = 1;
for (i = 0; i < sfx_skinsoundslot0; i++)
if (S_sfx[i].skinsound != -1)
@ -2343,16 +2343,10 @@ void R_InitSkins(void)
boolean R_SkinUnlock(INT32 skinnum)
{
return ((skinnum == -1) // Simplifies things elsewhere, since there's already plenty of checks for less-than-0...
|| (skins[skinnum].availability == 2) // SP/Coop is strict
|| (skins[skinnum].availability)
|| (modeattacking) // If you have someone else's run you might as well take a look
|| ((netgame)
&& ((dedicated) // Same reasoning as Command_Map_f - dedicated would be a nightmare otherwise
|| ((cv_forceskin.value == skinnum) // Forceskin is weak
|| (G_RingSlingerGametype() && (skins[skinnum].availability != 0)) // Ringslinger is disciplined
)
)
)
);
|| ((netgame) && (cv_forceskin.value == skinnum)) // Forceskin is weak
);
}
// returns true if the skin name is found (loaded from pwad)