From c9318599c7a0683294d5c88f12f576c0dd655d63 Mon Sep 17 00:00:00 2001
From: Lactozilla <jp6781615@gmail.com>
Date: Sat, 30 Nov 2024 10:25:30 -0300
Subject: [PATCH] Skip unchanged value validation in CV_SetCVar if there is a
can_change callback
---
src/command.c | 2 +-
src/netcode/d_netcmd.c | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/command.c b/src/command.c
index 399714bd0d..8f9166361d 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1988,7 +1988,7 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
if (!var->string)
I_Error("CV_Set: %s no string set!\n", var->name);
#endif
- if (!var || !var->string || !value || !stricmp(var->string, value))
+ if (!var || !var->string || !value || (var->can_change == NULL && !stricmp(var->string, value)))
return; // no changes
if (var->flags & CV_NETVAR)
diff --git a/src/netcode/d_netcmd.c b/src/netcode/d_netcmd.c
index 64feeeda31..961de44c2d 100644
--- a/src/netcode/d_netcmd.c
+++ b/src/netcode/d_netcmd.c
@@ -4910,14 +4910,16 @@ static void Name2_OnChange(void)
static boolean Skin_CanChange(const char *valstr)
{
- (void)valstr;
-
if (!Playing())
return true; // do whatever you want
if (!(multiplayer || netgame)) // In single player.
return true;
+ // You already are that skin.
+ if (stricmp(skins[players[consoleplayer].skin]->name, valstr) == 0)
+ return false;
+
if (CanChangeSkin(consoleplayer) && !P_PlayerMoving(consoleplayer))
return true;
else
@@ -4929,11 +4931,13 @@ static boolean Skin_CanChange(const char *valstr)
static boolean Skin2_CanChange(const char *valstr)
{
- (void)valstr;
-
if (!Playing() || !splitscreen)
return true; // do whatever you want
+ // You already are that skin.
+ if (stricmp(skins[players[secondarydisplayplayer].skin]->name, valstr) == 0)
+ return false;
+
if (CanChangeSkin(secondarydisplayplayer) && !P_PlayerMoving(secondarydisplayplayer))
return true;
else
--
GitLab