Merge branch 'credit_switch' into 'next'

No switching skins mid-credits/custom cutscene in SP

Does what it says on the tin.

See merge request !129
This commit is contained in:
Monster Iestyn 2016-12-13 09:33:53 -05:00
commit aa82042cf8
1 changed files with 1 additions and 2 deletions

View File

@ -4062,8 +4062,7 @@ static void Skin_OnChange(void)
if (!Playing())
return; // do whatever you want
if (!(cv_debug || devparm) && !(multiplayer || netgame) // In single player.
&& (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_CONTINUING))
if (!(cv_debug || devparm) && !(multiplayer || netgame)) // In single player.
{
CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin].name);
return;