#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[65536];
-char *cvar_null_string = "";
+cvar_t *cvar_hashtable[CVAR_HASHSIZE];
+const char *cvar_null_string = "";
/*
============
cvar_t *var;
// use hash lookup to minimize search time
- hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name));
+ hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name)) % CVAR_HASHSIZE;
for (var = cvar_hashtable[hashindex];var;var = var->nextonhashchain)
if (!strcmp (var_name, var->name))
return var;
return var;
}
+cvar_t *Cvar_FindVarLink (const char *var_name, cvar_t **parent, cvar_t ***link, cvar_t **prev_alpha)
+{
+ int hashindex;
+ cvar_t *var;
+
+ // use hash lookup to minimize search time
+ hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name));
+ if(parent) *parent = NULL;
+ if(prev_alpha) *prev_alpha = NULL;
+ if(link) *link = &cvar_hashtable[hashindex];
+ for (var = cvar_hashtable[hashindex];var;var = var->nextonhashchain)
+ {
+ if (!strcmp (var_name, var->name))
+ {
+ if(!prev_alpha || var == cvar_vars)
+ return var;
+
+ *prev_alpha = cvar_vars;
+ // if prev_alpha happens to become NULL then there has been some inconsistency elsewhere
+ // already - should I still insert '*prev_alpha &&' in the loop?
+ while((*prev_alpha)->next != var)
+ *prev_alpha = (*prev_alpha)->next;
+ return var;
+ }
+ if(parent) *parent = var;
+ }
+
+ return NULL;
+}
+
/*
============
Cvar_VariableValue
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);
+}
/*
============
{
qboolean changed;
size_t valuelen;
+ prvm_prog_t *tmpprog;
+ int i;
- changed = strcmp(var->string, value);
+ changed = strcmp(var->string, value) != 0;
// LordHavoc: don't reallocate when there is no change
if (!changed)
return;
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)
// whenever rcon_secure is changed to 0, clear rcon_password for
// security reasons (prevents a send-rcon-password-as-plaintext
// attack based on NQ protocol session takeover and svc_stufftext)
- if(!var->integer)
+ if(var->integer <= 0)
Cvar_Set("rcon_password", "");
}
else if (!strcmp(var->name, "net_slist_favorites"))
NetConn_UpdateFavorites();
}
+
+ tmpprog = prog;
+ for(i = 0; i < PRVM_MAXPROGS; ++i)
+ {
+ if(PRVM_ProgLoaded(i))
+ {
+ PRVM_SetProg(i);
+ Cvar_UpdateAutoCvar(var);
+ }
+ }
+ prog = tmpprog;
}
void Cvar_SetQuick (cvar_t *var, const char *value)
return;
}
- if (developer.integer >= 100)
- Con_Printf("Cvar_SetQuick({\"%s\", \"%s\", %i, \"%s\"}, \"%s\");\n", var->name, var->string, var->flags, var->defstring, value);
+ if (developer_extra.integer)
+ Con_DPrintf("Cvar_SetQuick({\"%s\", \"%s\", %i, \"%s\"}, \"%s\");\n", var->name, var->string, var->flags, var->defstring, value);
Cvar_SetQuick_Internal(var, value);
}
char *oldstr;
size_t alloclen;
- if (developer.integer >= 100)
- Con_Printf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags);
+ if (developer_extra.integer)
+ Con_DPrintf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags);
// first check to see if it has already been defined
cvar = Cvar_FindVar (variable->name);
{
if (cvar->flags & CVAR_ALLOCATED)
{
- if (developer.integer >= 100)
- Con_Printf("... replacing existing allocated cvar {\"%s\", \"%s\", %i}\n", cvar->name, cvar->string, cvar->flags);
+ if (developer_extra.integer)
+ Con_DPrintf("... replacing existing allocated cvar {\"%s\", \"%s\", %i}\n", cvar->name, cvar->string, cvar->flags);
// fixed variables replace allocated ones
// (because the engine directly accesses fixed variables)
// NOTE: this isn't actually used currently
// 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
- Con_Printf("Can't register variable %s, already defined\n", variable->name);
+ Con_DPrintf("Can't register variable %s, already defined\n", variable->name);
return;
}
}
// 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;
variable->next = next;
// link to head of list in this hash table index
- hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name));
+ hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name)) % CVAR_HASHSIZE;
variable->nextonhashchain = cvar_hashtable[hashindex];
cvar_hashtable[hashindex] = variable;
}
cvar_t *current, *next, *cvar;
size_t alloclen;
- if (developer.integer >= 100)
- Con_Printf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags);
+ if (developer_extra.integer)
+ Con_DPrintf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags);
// first check to see if it has already been defined
cvar = Cvar_FindVar (name);
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;
return cvar;
}
+// check for pure evil
+ if (!*name)
+ {
+ Con_Printf("Cvar_Get: invalid variable name\n");
+ return NULL;
+ }
+
// check for overlap with a command
if (Cmd_Exists (name))
{
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
cvar->next = next;
// link to head of list in this hash table index
- hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name));
+ hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name)) % CVAR_HASHSIZE;
cvar->nextonhashchain = cvar_hashtable[hashindex];
cvar_hashtable[hashindex] = cvar;
// perform a variable print or set
if (Cmd_Argc() == 1)
{
- Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, v->string, v->defstring);
+ Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, ((v->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : v->string), v->defstring);
return true;
}
- if (developer.integer >= 100)
+ if (developer_extra.integer)
Con_DPrint("Cvar_Command: ");
if (v->flags & CVAR_READONLY)
return true;
}
Cvar_Set (v->name, Cmd_Argv(1));
- if (developer.integer >= 100)
+ if (developer_extra.integer)
Con_DPrint("\n");
return true;
}
//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);
}
}
}
cvar_t *var;
// restore the default values of all cvars
for (var = cvar_vars ; var ; var = var->next)
- Cvar_SetQuick(var, var->defstring);
+ if((var->flags & CVAR_NORESETTODEFAULTS) == 0)
+ Cvar_SetQuick(var, var->defstring);
}
cvar_t *var;
// restore the default values of all cvars
for (var = cvar_vars ; var ; var = var->next)
- if (!(var->flags & CVAR_SAVE))
+ if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == 0)
Cvar_SetQuick(var, var->defstring);
}
cvar_t *var;
// restore the default values of all cvars
for (var = cvar_vars ; var ; var = var->next)
- if (var->flags & CVAR_SAVE)
+ if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == CVAR_SAVE)
Cvar_SetQuick(var, var->defstring);
}
void Cvar_WriteVariables (qfile_t *f)
{
cvar_t *var;
+ char buf1[MAX_INPUTLINE], buf2[MAX_INPUTLINE];
// 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)))
- FS_Printf(f, "%s%s \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", var->name, var->string);
+ if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || !(var->flags & CVAR_DEFAULTSET)))
+ {
+ 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);
+ }
}
if (len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp (partial,cvar->name,len)))
continue;
- Con_Printf("%s is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description);
+ Con_Printf("%s is \"%s\" [\"%s\"] %s\n", cvar->name, ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring, cvar->description);
count++;
}
return;
}
- if (developer.integer >= 100)
+ if (developer_extra.integer)
Con_DPrint("Set: ");
// all looks ok, create/modify the cvar
return;
}
- if (developer.integer >= 100)
+ if (developer_extra.integer)
Con_DPrint("SetA: ");
// all looks ok, create/modify the cvar
Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), CVAR_SAVE, Cmd_Argc() > 3 ? Cmd_Argv(3) : NULL);
}
+void Cvar_Del_f (void)
+{
+ int i;
+ cvar_t *cvar, *parent, **link, *prev;
+
+ if(Cmd_Argc() < 2)
+ {
+ Con_Printf("Del: wrong number of parameters, useage: unset <variablename1> [<variablename2> ...]\n");
+ return;
+ }
+ for(i = 1; i < Cmd_Argc(); ++i)
+ {
+ cvar = Cvar_FindVarLink(Cmd_Argv(i), &parent, &link, &prev);
+ if(!cvar)
+ {
+ Con_Printf("Del: %s is not defined\n", Cmd_Argv(i));
+ continue;
+ }
+ if(cvar->flags & CVAR_READONLY)
+ {
+ Con_Printf("Del: %s is read-only\n", cvar->name);
+ continue;
+ }
+ if(!(cvar->flags & CVAR_ALLOCATED))
+ {
+ Con_Printf("Del: %s is static and cannot be deleted\n", cvar->name);
+ continue;
+ }
+ if(cvar == cvar_vars)
+ {
+ cvar_vars = cvar->next;
+ }
+ else
+ {
+ // in this case, prev must be set, otherwise there has been some inconsistensy
+ // elsewhere already... should I still check for prev != NULL?
+ prev->next = cvar->next;
+ }
+
+ if(parent)
+ parent->nextonhashchain = cvar->nextonhashchain;
+ else if(link)
+ *link = cvar->nextonhashchain;
+
+ if(cvar->description != cvar_dummy_description)
+ Z_Free((char *)cvar->description);
+
+ Z_Free((char *)cvar->name);
+ Z_Free((char *)cvar->string);
+ Z_Free((char *)cvar->defstring);
+ Z_Free(cvar);
+ }
+}
+
#ifdef FILLALLCVARSWITHRUBBISH
void Cvar_FillAll_f()
{
projects / xonotic / darkplaces.git / blobdiff