#include "quakedef.h"
-char *cvar_dummy_description = "custom cvar";
+const char *cvar_dummy_description = "custom cvar";
cvar_t *cvar_vars = NULL;
cvar_t *cvar_hashtable[CVAR_HASHSIZE];
-char *cvar_null_string = "";
+const char *cvar_null_string = "";
/*
============
Con_Printf ("^3%s^7 is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description);
}
+// we assume that prog is already set to the target progs
+static void Cvar_UpdateAutoCvar(cvar_t *var)
+{
+ int i;
+ if(!prog)
+ Host_Error("Cvar_UpdateAutoCvar: no prog set");
+ i = PRVM_GetProgNr();
+ if(var->globaldefindex_progid[i] == prog->id)
+ {
+ // MUST BE SYNCED WITH prvm_edict.c PRVM_LoadProgs
+ int j;
+ const char *s;
+ prvm_eval_t *val = (prvm_eval_t *)(prog->globals.generic + prog->globaldefs[var->globaldefindex[i]].ofs);
+ switch(prog->globaldefs[var->globaldefindex[i]].type & ~DEF_SAVEGLOBAL)
+ {
+ case ev_float:
+ val->_float = var->value;
+ break;
+ case ev_vector:
+ s = var->string;
+ VectorClear(val->vector);
+ for (j = 0;j < 3;j++)
+ {
+ while (*s && ISWHITESPACE(*s))
+ s++;
+ if (!*s)
+ break;
+ val->vector[j] = atof(s);
+ while (!ISWHITESPACE(*s))
+ s++;
+ if (!*s)
+ break;
+ }
+ break;
+ case ev_string:
+ PRVM_ChangeEngineString(var->globaldefindex_stringno[i], var->string);
+ val->string = var->globaldefindex_stringno[i];
+ break;
+ }
+ }
+}
+
+// called after loading a savegame
+void Cvar_UpdateAllAutoCvars(void)
+{
+ cvar_t *var;
+ for (var = cvar_vars ; var ; var = var->next)
+ Cvar_UpdateAutoCvar(var);
+}
/*
============
valuelen = strlen(value);
if (!var->string || strlen(var->string) != valuelen)
{
- Z_Free (var->string); // free the old value string
+ Z_Free ((char *)var->string); // free the old value string
var->string = (char *)Z_Malloc (valuelen + 1);
}
- memcpy (var->string, value, valuelen + 1);
+ memcpy ((char *)var->string, value, valuelen + 1);
var->value = atof (var->string);
var->integer = (int) var->value;
if ((var->flags & CVAR_NOTIFY) && changed && sv.active)
if(PRVM_ProgLoaded(i))
{
PRVM_SetProg(i);
- if(var->globaldefindex_progid[i] == prog->id)
- {
- // MUST BE SYNCED WITH prvm_edict.c PRVM_LoadProgs
- int j;
- const char *s;
- prvm_eval_t *val = (prvm_eval_t *)(prog->globals.generic + prog->globaldefs[var->globaldefindex[i]].ofs);
- switch(prog->globaldefs[var->globaldefindex[i]].type & ~DEF_SAVEGLOBAL)
- {
- case ev_float:
- val->_float = var->value;
- break;
- case ev_vector:
- s = var->string;
- VectorClear(val->vector);
- for (j = 0;j < 3;j++)
- {
- while (*s && ISWHITESPACE(*s))
- s++;
- if (!*s)
- break;
- val->vector[j] = atof(s);
- while (!ISWHITESPACE(*s))
- s++;
- if (!*s)
- break;
- }
- break;
- case ev_string:
- PRVM_ChangeEngineString(var->globaldefindex_stringno[i], var->string);
- val->string = var->globaldefindex_stringno[i];
- break;
- }
- }
+ Cvar_UpdateAutoCvar(var);
}
}
prog = tmpprog;
// get rid of old allocated cvar
// (but not cvar->string and cvar->defstring, because we kept those)
- Z_Free(cvar->name);
+ Z_Free((char *)cvar->name);
Z_Free(cvar);
}
else
}
// copy the value off, because future sets will Z_Free it
- oldstr = variable->string;
+ oldstr = (char *)variable->string;
alloclen = strlen(variable->string) + 1;
variable->string = (char *)Z_Malloc (alloclen);
- memcpy (variable->string, oldstr, alloclen);
+ memcpy ((char *)variable->string, oldstr, alloclen);
variable->defstring = (char *)Z_Malloc (alloclen);
- memcpy (variable->defstring, oldstr, alloclen);
+ memcpy ((char *)variable->defstring, oldstr, alloclen);
variable->value = atof (variable->string);
variable->integer = (int) variable->value;
if(newdescription && (cvar->flags & CVAR_ALLOCATED))
{
if(cvar->description != cvar_dummy_description)
- Z_Free(cvar->description);
+ Z_Free((char *)cvar->description);
if(*newdescription)
{
alloclen = strlen(newdescription) + 1;
cvar->description = (char *)Z_Malloc(alloclen);
- memcpy(cvar->description, newdescription, alloclen);
+ memcpy((char *)cvar->description, newdescription, alloclen);
}
else
cvar->description = cvar_dummy_description;
cvar->flags = flags | CVAR_ALLOCATED;
alloclen = strlen(name) + 1;
cvar->name = (char *)Z_Malloc(alloclen);
- memcpy(cvar->name, name, alloclen);
+ memcpy((char *)cvar->name, name, alloclen);
alloclen = strlen(value) + 1;
cvar->string = (char *)Z_Malloc(alloclen);
- memcpy(cvar->string, value, alloclen);
+ memcpy((char *)cvar->string, value, alloclen);
cvar->defstring = (char *)Z_Malloc(alloclen);
- memcpy(cvar->defstring, value, alloclen);
+ memcpy((char *)cvar->defstring, value, alloclen);
cvar->value = atof (cvar->string);
cvar->integer = (int) cvar->value;
{
alloclen = strlen(newdescription) + 1;
cvar->description = (char *)Z_Malloc(alloclen);
- memcpy(cvar->description, newdescription, alloclen);
+ memcpy((char *)cvar->description, newdescription, alloclen);
}
else
cvar->description = cvar_dummy_description; // actually checked by VM_cvar_type
//Con_Printf("locking cvar %s (%s -> %s)\n", var->name, var->string, var->defstring);
var->flags |= CVAR_DEFAULTSET;
- Z_Free(var->defstring);
+ Z_Free((char *)var->defstring);
alloclen = strlen(var->string) + 1;
var->defstring = (char *)Z_Malloc(alloclen);
- memcpy(var->defstring, var->string, alloclen);
+ memcpy((char *)var->defstring, var->string, alloclen);
}
}
}
// don't save cvars that match their default value
for (var = cvar_vars ; var ; var = var->next)
- if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || (var->flags & CVAR_ALLOCATED)))
+ if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || !(var->flags & CVAR_DEFAULTSET)))
{
- Cmd_QuoteString(buf1, sizeof(buf1), var->name, "\"\\$");
- Cmd_QuoteString(buf2, sizeof(buf2), var->string, "\"\\$");
+ Cmd_QuoteString(buf1, sizeof(buf1), var->name, "\"\\$", false);
+ Cmd_QuoteString(buf2, sizeof(buf2), var->string, "\"\\$", false);
FS_Printf(f, "%s\"%s\" \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", buf1, buf2);
}
}
*link = cvar->nextonhashchain;
if(cvar->description != cvar_dummy_description)
- Z_Free(cvar->description);
+ Z_Free((char *)cvar->description);
- Z_Free(cvar->name);
- Z_Free(cvar->string);
- Z_Free(cvar->defstring);
+ Z_Free((char *)cvar->name);
+ Z_Free((char *)cvar->string);
+ Z_Free((char *)cvar->defstring);
Z_Free(cvar);
}
}