return var;
}
-static cvar_hash_t *Cvar_FindVarLink(cvar_state_t *cvars, const char *var_name, cvar_hash_t **parent, cvar_hash_t ***link, cvar_t **prev_alpha, int neededflags)
+static cvar_t *Cvar_FindVarLink(cvar_state_t *cvars, const char *var_name, cvar_t **parent, cvar_t ***link, cvar_t **prev_alpha, int neededflags)
{
int hashindex;
cvar_hash_t *hash;
hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name)) % CVAR_HASHSIZE;
if(parent) *parent = NULL;
if(prev_alpha) *prev_alpha = NULL;
- if(link) *link = &cvars->hashtable[hashindex];
+ if(link) *link = &cvars->hashtable[hashindex]->cvar;
for (hash = cvars->hashtable[hashindex];hash;hash = hash->next)
{
if (!strcmp (var_name, hash->cvar->name) && (hash->cvar->flags & neededflags))
for (int i = 0; i < hash->cvar->aliasindex; i++)
if (!strcmp (var_name, hash->cvar->aliases[i]) && (hash->cvar->flags & neededflags))
goto match;
- if(parent) *parent = hash;
+ if(parent) *parent = hash->cvar;
}
return NULL;
match:
if(!prev_alpha || hash->cvar == cvars->vars)
- return hash;
+ return hash->cvar;
*prev_alpha = cvars->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 != hash->cvar)
*prev_alpha = (*prev_alpha)->next;
- return hash;
+ return hash->cvar;
}
/*
Cvar_VariableValue
============
*/
-float Cvar_VariableValueOr(cvar_state_t *cvars, const char *var_name, double def, int neededflags)
+float Cvar_VariableValueOr(cvar_state_t *cvars, const char *var_name, float def, int neededflags)
{
cvar_t *var;
return buf;
}
-void Cvar_PrintHelp(cvar_t *cvar, const char *name, qboolean full)
+void Cvar_PrintHelp(cvar_t *cvar, const char *name, qbool full)
{
// Aliases are purple, cvars are yellow
if (strcmp(cvar->name, name))
Con_Printf("^6");
else
Con_Printf("^3");
- Con_Printf("%s^7 is \"%s\" [\"%s\"]", name, ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring);
+ Con_Printf("%s^7 is \"%s\" [\"%s\"]", name, ((cvar->flags & CF_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring);
if (strcmp(cvar->name, name))
Con_Printf(" (also ^3%s^7)", cvar->name);
if (full)
}
// check if a cvar is held by some progs
-static qboolean Cvar_IsAutoCvar(cvar_t *var)
+static qbool Cvar_IsAutoCvar(cvar_t *var)
{
int i;
prvm_prog_t *prog;
extern cvar_t sv_disablenotify;
static void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
{
- qboolean changed;
+ qbool changed;
size_t valuelen;
- char new_value[MAX_INPUTLINE];
changed = strcmp(var->string, value) != 0;
// LadyHavoc: don't reallocate when there is no change
if (!changed)
return;
- memcpy(new_value,value,MAX_INPUTLINE);
-
- // Call the function stored in the cvar for bounds checking, cleanup, etc
- if (var->callback)
- var->callback(new_value);
-
// LadyHavoc: don't reallocate when the buffer is the same size
- valuelen = strlen(new_value);
+ valuelen = strlen(value);
if (!var->string || strlen(var->string) != valuelen)
{
Z_Free ((char *)var->string); // free the old value string
var->string = (char *)Z_Malloc (valuelen + 1);
}
- memcpy ((char *)var->string, new_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 && !sv_disablenotify.integer)
+ if ((var->flags & CF_NOTIFY) && changed && 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?
- if ((var->flags & CVAR_SERVERINFO) && changed && sv.active)
+ if ((var->flags & CF_SERVERINFO) && changed && sv.active)
{
InfoString_SetValue(svs.serverinfo, sizeof(svs.serverinfo), var->name, var->string);
if (sv.active)
}
}
#endif
- if (var->flags & CVAR_USERINFO)
+ if (var->flags & CF_USERINFO)
CL_SetInfo(var->name, var->string, true, false, false, false);
Cvar_UpdateAutoCvar(var);
+
+ // Call the function stored in the cvar for bounds checking, cleanup, etc
+ if (var->callback)
+ var->callback(var);
}
void Cvar_SetQuick (cvar_t *var, const char *value)
void Cvar_Set_NoCallback(cvar_t *var, const char *value)
{
- void (*callback_save)(char *) = var->callback;
+ void (*callback_save)(cvar_t *) = var->callback;
var->callback = NULL;
Cvar_SetQuick_Internal(var, value);
var->callback = callback_save;
Cvar_SetValue
============
*/
-void Cvar_SetValueQuick(cvar_t *var, double value)
+void Cvar_SetValueQuick(cvar_t *var, float value)
{
char val[MAX_INPUTLINE];
- if ((double)((int)value) == value)
+ if ((float)((int)value) == value)
dpsnprintf(val, sizeof(val), "%i", (int)value);
else
dpsnprintf(val, sizeof(val), "%f", value);
Cvar_SetQuick(var, val);
}
-void Cvar_SetValue(cvar_state_t *cvars, const char *var_name, double value)
+void Cvar_SetValue(cvar_state_t *cvars, const char *var_name, float value)
{
char val[MAX_INPUTLINE];
- if ((double)((int)value) == value)
+ if ((float)((int)value) == value)
dpsnprintf(val, sizeof(val), "%i", (int)value);
else
dpsnprintf(val, sizeof(val), "%f", value);
Cvar_Set(cvars, var_name, val);
}
-void Cvar_RegisterCallback(cvar_t *variable, void (*callback)(char *))
+void Cvar_RegisterCallback(cvar_t *variable, void (*callback)(cvar_t *))
{
variable->callback = callback;
}
size_t alloclen;
int i;
- switch (variable->flags & (CVAR_CLIENT | CVAR_SERVER))
+ switch (variable->flags & (CF_CLIENT | CF_SERVER))
{
- case CVAR_CLIENT:
- case CVAR_SERVER:
- case CVAR_CLIENT | CVAR_SERVER:
+ case CF_CLIENT:
+ case CF_SERVER:
+ case CF_CLIENT | CF_SERVER:
cvars = &cvars_all;
break;
case 0:
- Sys_Error("Cvar_RegisterVariable({\"%s\", \"%s\", %i}) with no CVAR_CLIENT | CVAR_SERVER flags\n", variable->name, variable->string, variable->flags);
+ Sys_Error("Cvar_RegisterVariable({\"%s\", \"%s\", %i}) with no CF_CLIENT | CF_SERVER flags\n", variable->name, variable->string, variable->flags);
break;
default:
- Sys_Error("Cvar_RegisterVariable({\"%s\", \"%s\", %i}) with weird CVAR_CLIENT | CVAR_SERVER flags\n", variable->name, variable->string, variable->flags);
+ Sys_Error("Cvar_RegisterVariable({\"%s\", \"%s\", %i}) with weird CF_CLIENT | CF_SERVER flags\n", variable->name, variable->string, variable->flags);
break;
}
cvar = Cvar_FindVar(cvars, variable->name, ~0);
if (cvar)
{
- if (cvar->flags & CVAR_ALLOCATED)
+ if (cvar->flags & CF_ALLOCATED)
{
if (developer_extra.integer)
Con_DPrintf("... replacing existing allocated cvar {\"%s\", \"%s\", %i}\n", cvar->name, cvar->string, cvar->flags);
// (because the engine directly accesses fixed variables)
// NOTE: this isn't actually used currently
// (all cvars are registered before config parsing)
- variable->flags |= (cvar->flags & ~CVAR_ALLOCATED);
+ variable->flags |= (cvar->flags & ~CF_ALLOCATED);
// cvar->string is now owned by variable instead
variable->string = cvar->string;
variable->defstring = cvar->defstring;
{
cvar->flags |= flags;
Cvar_SetQuick_Internal (cvar, value);
- if(newdescription && (cvar->flags & CVAR_ALLOCATED))
+ if(newdescription && (cvar->flags & CF_ALLOCATED))
{
if(cvar->description != cvar_dummy_description)
Z_Free((char *)cvar->description);
// 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 | CVAR_ALLOCATED;
+ cvar->flags = flags | CF_ALLOCATED;
cvar->name = (char *)Mem_strdup(zonemempool, name);
cvar->string = (char *)Mem_strdup(zonemempool, value);
cvar->defstring = (char *)Mem_strdup(zonemempool, value);
return cvar;
}
-qboolean Cvar_Readonly (cvar_t *var, const char *cmd_name)
+qbool Cvar_Readonly (cvar_t *var, const char *cmd_name)
{
- if (var->flags & CVAR_READONLY)
+ if (var->flags & CF_READONLY)
{
if(cmd_name)
Con_Printf("%s: ",cmd_name);
Handles variable inspection and changing from the console
============
*/
-qboolean Cvar_Command (cmd_state_t *cmd)
+qbool Cvar_Command (cmd_state_t *cmd)
{
cvar_state_t *cvars = cmd->cvars;
cvar_t *v;
cvar_t *var;
// unlock the default values of all cvars
for (var = cvars->vars ; var ; var = var->next)
- var->flags &= ~CVAR_DEFAULTSET;
+ var->flags &= ~CF_DEFAULTSET;
}
// lock in the default values of all cvars
for (var = cvars->vars ; var ; var = var->next)
{
- if (!(var->flags & CVAR_DEFAULTSET))
+ if (!(var->flags & CF_DEFAULTSET))
{
size_t alloclen;
//Con_Printf("locking cvar %s (%s -> %s)\n", var->name, var->string, var->defstring);
- var->flags |= CVAR_DEFAULTSET;
+ var->flags |= CF_DEFAULTSET;
Z_Free((char *)var->defstring);
alloclen = strlen(var->string) + 1;
var->defstring = (char *)Z_Malloc(alloclen);
if (c->initstate)
{
// restore this cvar, it existed at init
- if (((c->flags ^ c->initflags) & CVAR_MAXFLAGSVAL)
+ 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 : ""))
{
}
else
{
- if (!(c->flags & CVAR_ALLOCATED))
+ if (!(c->flags & CF_ALLOCATED))
{
Con_DPrintf("Cvar_RestoreInitState: Unable to destroy cvar \"%s\", it was registered after init!\n", c->name);
// In this case, at least reset it to the default.
- if((c->flags & CVAR_NORESETTODEFAULTS) == 0)
+ if((c->flags & CF_PERSISTENT) == 0)
Cvar_SetQuick(c, c->defstring);
cp = &c->next;
continue;
{
Con_DPrintf("Cvar_RestoreInitState: Unable to destroy cvar \"%s\", it is an autocvar used by running progs!\n", c->name);
// In this case, at least reset it to the default.
- if((c->flags & CVAR_NORESETTODEFAULTS) == 0)
+ if((c->flags & CF_PERSISTENT) == 0)
Cvar_SetQuick(c, c->defstring);
cp = &c->next;
continue;
// restore the default values of all cvars
for (var = cvars->vars ; var ; var = var->next)
{
- if((var->flags & CVAR_NORESETTODEFAULTS) == 0)
+ if((var->flags & CF_PERSISTENT) == 0)
Cvar_SetQuick(var, var->defstring);
}
}
// restore the default values of all cvars
for (var = cvars->vars ; var ; var = var->next)
{
- if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == 0)
+ if ((var->flags & (CF_PERSISTENT | CF_ARCHIVE)) == 0)
Cvar_SetQuick(var, var->defstring);
}
}
// restore the default values of all cvars
for (var = cvars->vars ; var ; var = var->next)
{
- if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == CVAR_SAVE)
+ if ((var->flags & (CF_PERSISTENT | CF_ARCHIVE)) == CF_ARCHIVE)
Cvar_SetQuick(var, var->defstring);
}
}
// don't save cvars that match their default value
for (var = cvars->vars ; var ; var = var->next) {
- if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || ((var->flags & CVAR_ALLOCATED) && !(var->flags & CVAR_DEFAULTSET))))
+ if ((var->flags & CF_ARCHIVE) && (strcmp(var->string, var->defstring) || ((var->flags & CF_ALLOCATED) && !(var->flags & CF_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);
+ FS_Printf(f, "%s\"%s\" \"%s\"\n", var->flags & CF_ALLOCATED ? "seta " : "", buf1, buf2);
}
}
}
cvar_t *cvar;
const char *partial;
int count;
- qboolean ispattern;
+ qbool ispattern;
char vabuf[1024];
if (Cmd_Argc(cmd) > 1)
Con_DPrint("SetA: ");
// all looks ok, create/modify the cvar
- Cvar_Get(cvars, Cmd_Argv(cmd, 1), Cmd_Argv(cmd, 2), cmd->cvars_flagsmask | CVAR_SAVE, Cmd_Argc(cmd) > 3 ? Cmd_Argv(cmd, 3) : NULL);
+ Cvar_Get(cvars, Cmd_Argv(cmd, 1), Cmd_Argv(cmd, 2), cmd->cvars_flagsmask | CF_ARCHIVE, Cmd_Argc(cmd) > 3 ? Cmd_Argv(cmd, 3) : NULL);
}
void Cvar_Del_f(cmd_state_t *cmd)
cvar_state_t *cvars = cmd->cvars;
int neededflags = ~0;
int i;
- cvar_hash_t *hash, *parent, **link;
+ cvar_t *parent, **link;
cvar_t *cvar, *prev;
if(Cmd_Argc(cmd) < 2)
}
for(i = 1; i < Cmd_Argc(cmd); ++i)
{
- hash = Cvar_FindVarLink(cvars, Cmd_Argv(cmd, i), &parent, &link, &prev, neededflags);
- cvar = hash->cvar;
+ cvar = Cvar_FindVarLink(cvars, Cmd_Argv(cmd, i), &parent, &link, &prev, neededflags);
if(!cvar)
{
}
if(Cvar_Readonly(cvar, Cmd_Argv(cmd, 0)))
continue;
- if(!(cvar->flags & CVAR_ALLOCATED))
+ if(!(cvar->flags & CF_ALLOCATED))
{
Con_Printf("%s: %s is static and cannot be deleted\n", Cmd_Argv(cmd, 0), cvar->name);
continue;
}
if(parent)
- parent->next = hash->next;
+ parent->next = cvar->next;
else if(link)
- *link = hash->next;
+ *link = cvar->next;
if(cvar->description != cvar_dummy_description)
Z_Free((char *)cvar->description);
char *buf, *p, *q;
int n, i;
cvar_t *var;
- qboolean verify;
+ qbool verify;
if(Cmd_Argc(cmd) != 2)
{
Con_Printf("Usage: %s length to plant rubbish\n", Cmd_Argv(cmd, 0));