From c920e688c0c4bc216f50f39667e10827c625c84e Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Fri, 9 Oct 2020 16:22:17 -0700
Subject: [PATCH] When save/loading config use revert value for netvars if you
are not the server
---
src/command.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 77 insertions(+), 8 deletions(-)
diff --git a/src/command.c b/src/command.c
index c8f1aeccc1..74c4789d13 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1393,6 +1393,18 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
for (i = MAXVAL+1; var->PossibleValue[i].strvalue; i++)
if (v == var->PossibleValue[i].value || !stricmp(var->PossibleValue[i].strvalue, valstr))
{
+ if (client && execversion_enabled)
+ {
+ if (var->revert.allocated)
+ {
+ Z_Free(var->revert.v.string);
+ }
+
+ var->revert.v.const_munge = var->PossibleValue[i].strvalue;
+
+ return;
+ }
+
var->value = var->PossibleValue[i].value;
var->string = var->PossibleValue[i].strvalue;
goto finish;
@@ -1453,12 +1465,36 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
// ...or not.
goto badinput;
found:
+ if (client && execversion_enabled)
+ {
+ if (var->revert.allocated)
+ {
+ Z_Free(var->revert.v.string);
+ }
+
+ var->revert.v.const_munge = var->PossibleValue[i].strvalue;
+
+ return;
+ }
+
var->value = var->PossibleValue[i].value;
var->string = var->PossibleValue[i].strvalue;
goto finish;
}
}
+ if (client && execversion_enabled)
+ {
+ if (var->revert.allocated)
+ {
+ Z_Free(var->revert.v.string);
+ }
+
+ var->revert.v.string = Z_StrDup(valstr);
+
+ return;
+ }
+
// free the old value string
Z_Free(var->zstring);
@@ -1796,6 +1832,14 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
// send the value of the variable
UINT8 buf[128];
UINT8 *p = buf;
+
+ // Loading from a config in a netgame? Set revert value.
+ if (client && execversion_enabled)
+ {
+ Setvalue(var, value, true);
+ return;
+ }
+
if (!(server || (addedtogame && IsPlayerAdmin(consoleplayer))))
{
CONS_Printf(M_GetText("Only the server or admin can change: %s %s\n"), var->name, var->string);
@@ -2329,18 +2373,43 @@ void CV_SaveVariables(FILE *f)
{
char stringtowrite[MAXTEXTCMD+1];
- // Silly hack for Min/Max vars
- if (!strcmp(cvar->string, "MAX") || !strcmp(cvar->string, "MIN"))
+ const char * string;
+
+ if (cvar->revert.v.string != NULL)
{
- if (cvar->flags & CV_FLOAT)
- sprintf(stringtowrite, "%f", FIXED_TO_FLOAT(cvar->value));
- else
- sprintf(stringtowrite, "%d", cvar->value);
+ string = cvar->revert.v.string;
}
else
- strcpy(stringtowrite, cvar->string);
+ {
+ string = cvar->string;
+ }
+
+ // Silly hack for Min/Max vars
+#define MINVAL 0
+#define MAXVAL 1
+ if (
+ cvar->PossibleValue != NULL &&
+ cvar->PossibleValue[0].strvalue &&
+ stricmp(cvar->PossibleValue[0].strvalue, "MIN") == 0
+ ){ // bounded cvar
+ int which = stricmp(string, "MAX") == 0;
+
+ if (which || stricmp(string, "MIN") == 0)
+ {
+ INT32 value = cvar->PossibleValue[which].value;
+
+ if (cvar->flags & CV_FLOAT)
+ sprintf(stringtowrite, "%f", FIXED_TO_FLOAT(value));
+ else
+ sprintf(stringtowrite, "%d", value);
+
+ string = stringtowrite;
+ }
+ }
+#undef MINVAL
+#undef MAXVAL
- fprintf(f, "%s \"%s\"\n", cvar->name, stringtowrite);
+ fprintf(f, "%s \"%s\"\n", cvar->name, string);
}
}
--
GitLab