Tidy up conditions for forceskin to not include !K_CanChangeRules or Playing.

This commit is contained in:
toaster 2023-02-17 16:36:38 +00:00
parent 05ee3df2f4
commit 4d607ccdec

View file

@ -1356,7 +1356,7 @@ boolean CanChangeSkin(INT32 playernum)
return true; return true;
// Force skin in effect. // Force skin in effect.
if (cv_forceskin.value != -1) if (cv_forceskin.value != -1 && K_CanChangeRules(true))
return false; return false;
// ... there used to be a lot more here, but it's now handled in Got_NameAndColor. // ... 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) static void ForceSkin_OnChange(void)
{ {
// NOT in SP, silly! // NOT in SP, silly!
if (!(netgame || multiplayer)) if (!Playing() || !K_CanChangeRules(true))
return; return;
if (cv_forceskin.value < 0) if (cv_forceskin.value < 0)