From 4d607ccdec6a56816dd6607fde9941c482ce0e15 Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 17 Feb 2023 16:36:38 +0000 Subject: [PATCH] Tidy up conditions for forceskin to not include !K_CanChangeRules or Playing. --- src/d_netcmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index fba65ba3b..e4223c5ea 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1356,7 +1356,7 @@ boolean CanChangeSkin(INT32 playernum) return true; // Force skin in effect. - if (cv_forceskin.value != -1) + if (cv_forceskin.value != -1 && K_CanChangeRules(true)) return false; // ... there used to be a lot more here, but it's now handled in Got_NameAndColor. @@ -6107,7 +6107,7 @@ static void Command_Automate_Set(void) static void ForceSkin_OnChange(void) { // NOT in SP, silly! - if (!(netgame || multiplayer)) + if (!Playing() || !K_CanChangeRules(true)) return; if (cv_forceskin.value < 0)