From 8fe6971e9adda1c717c04b50b94058efaf380cdc Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 25 Sep 2022 16:49:22 -0700 Subject: [PATCH 1/2] Fix -Wbad-function-cast --- src/d_clisrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index acf9bdb1c..5e24839e8 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -924,7 +924,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime) strncpy(netbuffer->u.serverinfo.gametypename, Gametype_Names[prefgametype], sizeof netbuffer->u.serverinfo.gametypename); netbuffer->u.serverinfo.modifiedgame = (UINT8)modifiedgame; - netbuffer->u.serverinfo.cheatsenabled = (UINT8)CV_CheatsEnabled(); + netbuffer->u.serverinfo.cheatsenabled = CV_CheatsEnabled(); netbuffer->u.serverinfo.kartvars = (UINT8) ( (gamespeed & SV_SPEEDMASK) | From 839f59a896f79910769c739219eba3ae5e736c64 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 25 Sep 2022 16:50:32 -0700 Subject: [PATCH 2/2] Make CV_CHEAT cheats disabled cvar override always work for real --- src/command.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/command.c b/src/command.c index a1c95e5df..74de35543 100644 --- a/src/command.c +++ b/src/command.c @@ -1600,6 +1600,7 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth) { // Enforce to default value without cheats. overridestr = var->defaultvalue; + valstr = overridestr; } if (CV_CompleteValue(var, &overridestr, &overrideval))