memcpy ((char *)var->string, value, valuelen + 1);
var->value = atof (var->string);
var->integer = (int) var->value;
- if ((var->flags & CF_NOTIFY) && changed && sv.active && !sv_disablenotify.integer)
+ if ((var->flags & CF_NOTIFY) && sv.active && !sv_disablenotify.integer)
SV_BroadcastPrintf("\003^3Server cvar \"%s\" changed to \"%s\"\n", var->name, var->string);
#if 0
// TODO: add infostring support to the server?
Cvar_SetQuick(var, value);
}
-void Cvar_Set_NoCallback(cvar_t *var, const char *value)
-{
- void (*callback_save)(cvar_t *) = var->callback;
- var->callback = NULL;
- Cvar_SetQuick_Internal(var, value);
- var->callback = callback_save;
-}
-
/*
============
Cvar_SetValue
hash->cvar = variable;
}
+/*
+============
+Cvar_Link
+
+Links a variable to the variable list and hashtable
+============
+*/
+static void Cvar_Link(cvar_t *variable, cvar_state_t *cvars)
+{
+ cvar_t *current, *next;
+ cvar_hash_t *hash;
+ int hashindex;
+ /*
+ * Link the variable in
+ * alphanumerical order
+ */
+ for( current = NULL, next = cvars->vars ; next && strcmp( next->name, variable->name ) < 0 ; current = next, next = next->next )
+ ;
+ if(current)
+ current->next = variable;
+ else
+ cvars->vars = variable;
+ variable->next = next;
+
+ // link to head of list in this hash table index
+ hash = (cvar_hash_t *)Z_Malloc(sizeof(cvar_hash_t));
+ hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name)) % CVAR_HASHSIZE;
+ hash->next = cvars->hashtable[hashindex];
+ hash->cvar = variable;
+ cvars->hashtable[hashindex] = hash;
+}
+
/*
============
Cvar_RegisterVariable
void Cvar_RegisterVariable (cvar_t *variable)
{
cvar_state_t *cvars = NULL;
- int hashindex;
- cvar_hash_t *hash;
- cvar_t *current, *next, *cvar;
- char *oldstr;
- size_t alloclen;
+ cvar_t *current, *cvar;
int i;
switch (variable->flags & (CF_CLIENT | CF_SERVER))
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
+ // first check to see if it has already been defined
cvar = Cvar_FindVar(cvars, variable->name, ~0);
if (cvar)
{
return;
}
-// check for overlap with a command
+ // check for overlap with a command
if (Cmd_Exists(&cmd_client, variable->name) || Cmd_Exists(&cmd_server, variable->name))
{
Con_Printf("Cvar_RegisterVariable: %s is a command\n", variable->name);
return;
}
-// copy the value off, because future sets will Z_Free it
- oldstr = (char *)variable->string;
- alloclen = strlen(variable->string) + 1;
- variable->string = (char *)Z_Malloc (alloclen);
- memcpy ((char *)variable->string, oldstr, alloclen);
- variable->defstring = (char *)Z_Malloc (alloclen);
- memcpy ((char *)variable->defstring, oldstr, alloclen);
+ // copy the value off, because future sets will Z_Free it
+ variable->name = (char *)Mem_strdup(zonemempool, variable->name);
+ variable->string = (char *)Mem_strdup(zonemempool, variable->string);
+ variable->defstring = (char *)Mem_strdup(zonemempool, variable->string);
variable->value = atof (variable->string);
variable->integer = (int) variable->value;
variable->aliasindex = 0;
+ variable->initstate = NULL;
// 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 = cvars->vars ; next && strcmp( next->name, variable->name ) < 0 ; current = next, next = next->next )
- ;
- if( current ) {
- current->next = variable;
- } else {
- cvars->vars = variable;
- }
- variable->next = next;
-
- // link to head of list in this hash table index
- hash = (cvar_hash_t *)Z_Malloc(sizeof(cvar_hash_t));
- hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name)) % CVAR_HASHSIZE;
- hash->next = cvars->hashtable[hashindex];
- hash->cvar = variable;
- cvars->hashtable[hashindex] = hash;
+ Cvar_Link(variable, cvars);
}
/*
*/
cvar_t *Cvar_Get(cvar_state_t *cvars, const char *name, const char *value, int flags, const char *newdescription)
{
- int hashindex;
- cvar_hash_t *hash;
- cvar_t *current, *next, *cvar;
+ cvar_t *cvar;
int i;
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
+ // first check to see if it has already been defined
cvar = Cvar_FindVar(cvars, name, ~0);
if (cvar)
{
return cvar;
}
-// check for pure evil
+ // check for pure evil
if (!*name)
{
Con_Printf("Cvar_Get: invalid variable name\n");
return NULL;
}
-// check for overlap with a command
+ // check for overlap with a command
if (Cmd_Exists(&cmd_client, name) || Cmd_Exists(&cmd_server, name))
{
Con_Printf("Cvar_Get: %s is a command\n", name);
return NULL;
}
-// allocate a new cvar, cvar name, and cvar string
-// TODO: factorize the following code with the one at the end of Cvar_RegisterVariable()
-// FIXME: these never get Z_Free'd
+ // allocate a new cvar, cvar name, and cvar string
+ // TODO: factorize the following code with the one at the end of Cvar_RegisterVariable()
+ // FIXME: these never get Z_Free'd
cvar = (cvar_t *)Z_Malloc(sizeof(cvar_t));
cvar->flags = flags | CF_ALLOCATED;
cvar->name = (char *)Mem_strdup(zonemempool, name);
cvar->value = atof (cvar->string);
cvar->integer = (int) cvar->value;
cvar->aliases = (char **)Z_Malloc(sizeof(char **));
+ cvar->initstate = NULL;
memset(cvar->aliases, 0, sizeof(char *));
if(newdescription && *newdescription)
for (i = 0;i < PRVM_PROG_MAX;i++)
cvar->globaldefindex[i] = -1;
-// link the variable in
-// alphanumerical order
- for( current = NULL, next = cvars->vars ; next && strcmp( next->name, cvar->name ) < 0 ; current = next, next = next->next )
- ;
- if( current )
- current->next = cvar;
- else
- cvars->vars = cvar;
- cvar->next = next;
-
- // link to head of list in this hash table index
- hash = (cvar_hash_t *)Z_Malloc(sizeof(cvar_hash_t));
- hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name)) % CVAR_HASHSIZE;
- hash->next = cvars->hashtable[hashindex];
- cvars->hashtable[hashindex] = hash;
- hash->cvar = cvar;
+ Cvar_Link(cvar, cvars);
return cvar;
}
cvar_state_t *cvars = cmd->cvars;
cvar_t *v;
-// check variables
+ // check variables
v = Cvar_FindVar(cvars, Cmd_Argv(cmd, 0), (cmd->cvars_flagsmask));
if (!v)
return false;
-// perform a variable print or set
+ // perform a variable print or set
if (Cmd_Argc(cmd) == 1)
{
Cvar_PrintHelp(v, Cmd_Argv(cmd, 0), true);
if (developer_extra.integer)
Con_DPrint("Cvar_Command: ");
-
+
if(Cvar_Readonly(v, NULL))
return true;
-
+
Cvar_SetQuick(v, Cmd_Argv(cmd, 1));
if (developer_extra.integer)
Con_DPrint("\n");
return true;
}
-
void Cvar_UnlockDefaults(cmd_state_t *cmd)
{
cvar_state_t *cvars = cmd->cvars;
var->flags &= ~CF_DEFAULTSET;
}
-
void Cvar_LockDefaults_f(cmd_state_t *cmd)
{
cvar_state_t *cvars = cmd->cvars;
cvar_t *c;
for (c = cvars->vars;c;c = c->next)
{
- c->initstate = true;
- c->initflags = c->flags;
- c->initdefstring = Mem_strdup(zonemempool, c->defstring);
- c->initstring = Mem_strdup(zonemempool, c->string);
- c->initvalue = c->value;
- c->initinteger = c->integer;
- VectorCopy(c->vector, c->initvector);
+ c->initstate = (cvar_t *)Z_Malloc(sizeof(cvar_t));
+ memcpy(c->initstate, c, sizeof(cvar_t));
}
}
if (c->initstate)
{
// restore this cvar, it existed at init
- if (((c->flags ^ c->initflags) & CF_MAXFLAGSVAL)
- || strcmp(c->defstring ? c->defstring : "", c->initdefstring ? c->initdefstring : "")
- || strcmp(c->string ? c->string : "", c->initstring ? c->initstring : ""))
+ if (((c->flags ^ c->initstate->flags) & CF_MAXFLAGSVAL)
+ || strcmp(c->defstring ? c->defstring : "", c->initstate->defstring ? c->initstate->defstring : "")
+ || strcmp(c->string ? c->string : "", c->initstate->string ? c->initstate->string : ""))
{
Con_DPrintf("Cvar_RestoreInitState: Restoring cvar \"%s\"\n", c->name);
if (c->defstring)
Z_Free((char *)c->defstring);
- c->defstring = Mem_strdup(zonemempool, c->initdefstring);
+ c->defstring = Mem_strdup(zonemempool, c->initstate->defstring);
if (c->string)
Z_Free((char *)c->string);
- c->string = Mem_strdup(zonemempool, c->initstring);
+ c->string = Mem_strdup(zonemempool, c->initstate->string);
}
- c->flags = c->initflags;
- c->value = c->initvalue;
- c->integer = c->initinteger;
- VectorCopy(c->initvector, c->vector);
+ c->flags = c->initstate->flags;
+ c->value = c->initstate->value;
+ c->integer = c->initstate->integer;
+ VectorCopy(c->initstate->vector, c->vector);
cp = &c->next;
}
else
}
}
-
void Cvar_ResetToDefaults_NoSaveOnly_f(cmd_state_t *cmd)
{
cvar_state_t *cvars = cmd->cvars;
}
}
-
/*
============
Cvar_WriteVariables
}
}
-
// Added by EvilTypeGuy eviltypeguy@qeradiant.com
// 2000-01-09 CvarList command By Matthias "Maddes" Buecher, http://www.inside3d.com/qip/
/*
projects / xonotic / darkplaces.git / blobdiff