From d2d88a919b9aa29a16d11b125febe0c0de199a35 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Thu, 26 Jan 2017 12:47:47 +0000
Subject: [PATCH] * Allowing for changing skins on command line startup again.
* Fixing an inconsistency with being able to change skin colours when you
shouldn't be able to, much like the previous skin change issue that was
fixed.
---
src/d_netcmd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index f61c80cb2c..8f6c45b3ee 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -4102,7 +4102,8 @@ static void Skin_OnChange(void)
if (!Playing())
return; // do whatever you want
- if (!(cv_debug || devparm) && !(multiplayer || netgame)) // In single player.
+ if (!(cv_debug || devparm) && !(multiplayer || netgame) // In single player.
+ && (gamestate != GS_WAITINGPLAYERS)) // allows command line -warp x +skin y
{
CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin].name);
return;
@@ -4145,8 +4146,7 @@ static void Color_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;
--
GitLab