X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cvar.c;h=2a0acae8edefad814c472bf0df404c64b6e7925e;hb=1c5b05b0ca10314110e98d8d851b17c933e2506e;hp=119e296d656ca914c3bede8f16261b44c5fcc0fa;hpb=1ca77593af8eef6c6c286488af78ba2d4b6ae293;p=xonotic%2Fdarkplaces.git

diff --git a/cvar.c b/cvar.c
index 119e296d..2a0acae8 100644
--- a/cvar.c
+++ b/cvar.c
@@ -486,6 +486,7 @@ void Cvar_RegisterVariable (cvar_t *variable)
 	cvar_t *current, *next, *cvar;
 	char *oldstr;
 	size_t alloclen;
+	int i;
 
 	if (developer_extra.integer)
 		Con_DPrintf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags);
@@ -508,6 +509,9 @@ void Cvar_RegisterVariable (cvar_t *variable)
 			variable->defstring = cvar->defstring;
 			variable->value = atof (variable->string);
 			variable->integer = (int) variable->value;
+			// Preserve autocvar status.
+			memcpy(variable->globaldefindex, cvar->globaldefindex, sizeof(variable->globaldefindex));
+			memcpy(variable->globaldefindex_stringno, cvar->globaldefindex_stringno, sizeof(variable->globaldefindex_stringno));
 			// replace cvar with this one...
 			variable->next = cvar->next;
 			if (cvar_vars == cvar)
@@ -550,6 +554,10 @@ void Cvar_RegisterVariable (cvar_t *variable)
 	variable->value = atof (variable->string);
 	variable->integer = (int) variable->value;
 
+	// Mark it as not an autocvar.
+	for (i = 0;i < PRVM_PROG_MAX;i++)
+		variable->globaldefindex[i] = -1;
+
 // link the variable in
 // alphanumerical order
 	for( current = NULL, next = cvar_vars ; next && strcmp( next->name, variable->name ) < 0 ; current = next, next = next->next )
@@ -578,6 +586,7 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne
 {
 	int hashindex;
 	cvar_t *current, *next, *cvar;
+	int i;
 
 	if (developer_extra.integer)
 		Con_DPrintf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags);
@@ -631,6 +640,10 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne
 	else
 		cvar->description = cvar_dummy_description; // actually checked by VM_cvar_type
 
+	// Mark it as not an autocvar.
+	for (i = 0;i < PRVM_PROG_MAX;i++)
+		cvar->globaldefindex[i] = -1;
+
 // link the variable in
 // alphanumerical order
 	for( current = NULL, next = cvar_vars ; next && strcmp( next->name, cvar->name ) < 0 ; current = next, next = next->next )