Cvar_FindVar
============
*/
-cvar_t *Cvar_FindVar(cvar_state_t *cvars, const char *var_name, int neededflags, qboolean alias)
+cvar_t *Cvar_FindVar(cvar_state_t *cvars, const char *var_name, int neededflags)
{
int hashindex;
- cvar_t *var;
+ cvar_hash_t *hash;
// use hash lookup to minimize search time
hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name)) % CVAR_HASHSIZE;
- for (var = cvars->hashtable[hashindex];var;var = var->nextonhashchain)
- if (!strcmp (var_name, var->name))
- {
- if(!alias && var->alias)
- return var->alias;
- return var;
- }
+ for (hash = cvars->hashtable[hashindex];hash;hash = hash->next)
+ if (!strcmp (var_name, hash->cvar->name) && (hash->cvar->flags & neededflags))
+ return hash->cvar;
+ else
+ for (int i = 0; i < hash->cvar->aliasindex; i++)
+ if (!strcmp (var_name, hash->cvar->aliases[i]) && (hash->cvar->flags & neededflags))
+ return hash->cvar;
return NULL;
}
if (*prev_var_name)
{
- var = Cvar_FindVar(cvars, prev_var_name, neededflags, false);
+ var = Cvar_FindVar(cvars, prev_var_name, neededflags);
if (!var)
return NULL;
var = var->next;
return var;
}
-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)
+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)
{
int hashindex;
- cvar_t *var;
+ cvar_hash_t *hash;
// 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 = &cvars->hashtable[hashindex];
- for (var = cvars->hashtable[hashindex];var;var = var->nextonhashchain)
+ for (hash = cvars->hashtable[hashindex];hash;hash = hash->next)
{
- if (!strcmp (var_name, var->name) && (var->flags & neededflags))
- {
- if(!prev_alpha || var == cvars->vars)
- return var;
-
- *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 != var)
- *prev_alpha = (*prev_alpha)->next;
- return var;
- }
- if(parent) *parent = var;
+ if (!strcmp (var_name, hash->cvar->name) && (hash->cvar->flags & neededflags))
+ goto match;
+ else
+ 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;
}
-
- return NULL;
+ return NULL;
+match:
+ if(!prev_alpha || hash->cvar == cvars->vars)
+ return hash;
+
+ *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;
}
/*
{
cvar_t *var;
- var = Cvar_FindVar(cvars, var_name, neededflags, false);
+ var = Cvar_FindVar(cvars, var_name, neededflags);
if (!var)
return def;
return atof (var->string);
{
cvar_t *var;
- var = Cvar_FindVar(cvars, var_name, neededflags, false);
+ var = Cvar_FindVar(cvars, var_name, neededflags);
if (!var)
return def;
return var->string;
{
cvar_t *var;
- var = Cvar_FindVar(cvars, var_name, neededflags, false);
+ var = Cvar_FindVar(cvars, var_name, neededflags);
if (!var)
return cvar_null_string;
return var->defstring;
{
cvar_t *var;
- var = Cvar_FindVar(cvars, var_name, neededflags, false);
+ var = Cvar_FindVar(cvars, var_name, neededflags);
if (!var)
return cvar_null_string;
return var->description;
for (cvar = cvars->vars; cvar; cvar = cvar->next)
if (!strncasecmp(partial, cvar->name, len) && (cvar->flags & neededflags))
h++;
-
+ else
+ for(int i = 0; i < cvar->aliasindex; i++)
+ if (!strncasecmp(partial, cvar->aliases[i], len) && (cvar->flags & neededflags))
+ h++;
+
return h;
}
for (cvar = cvars->vars; cvar; cvar = cvar->next)
if (!strncasecmp(partial, cvar->name, len) && (cvar->flags & neededflags))
buf[bpos++] = cvar->name;
+ else
+ for(int i = 0; i < cvar->aliasindex; i++)
+ if (!strncasecmp(partial, cvar->aliases[i], len) && (cvar->flags & neededflags))
+ buf[bpos++] = cvar->aliases[i];
+
buf[bpos] = NULL;
return buf;
}
-void Cvar_PrintHelp(cvar_t *cvar, qboolean full)
+void Cvar_PrintHelp(cvar_t *cvar, const char *name, qboolean full)
{
- cvar_t *cvar_actual;
-
- Con_Printf("^3%s^7", cvar->name);
- if(cvar->alias) {
- cvar_actual = cvar->alias;
- Con_Printf(" (now ^3%s^7)", cvar_actual->name);
- } else {
- cvar_actual = cvar;
- }
-
- Con_Printf(" is \"%s\" [\"%s\"] ", ((cvar_actual->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar_actual->string), cvar_actual->defstring);
+ Con_Printf("^3%s^7", name);
+ if (strcmp(cvar->name, name))
+ Con_Printf(" (now ^3%s^7)", cvar->name);
+ Con_Printf(" is \"%s\" [\"%s\"] ", ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring);
if (full)
- Con_Printf("%s", cvar_actual->description);
+ Con_Printf("%s", cvar->description);
Con_Printf("\n");
}
// Loop through the command list and print all matches
for (cvar = cvars->vars; cvar; cvar = cvar->next)
if (!strncasecmp(partial, cvar->name, len) && (cvar->flags & neededflags))
- Cvar_PrintHelp(cvar, true);
+ Cvar_PrintHelp(cvar, cvar->name, true);
+ else
+ for (int i = 0; i < cvar->aliasindex; i++)
+ if (!strncasecmp (partial, cvar->aliases[i], len) && (cvar->flags & neededflags))
+ Cvar_PrintHelp(cvar, cvar->aliases[i], true);
+
+
}
// check if a cvar is held by some progs
char vabuf[1024];
char new_value[MAX_INPUTLINE];
- if(var->alias)
- var = var->alias;
-
changed = strcmp(var->string, value) != 0;
// LadyHavoc: don't reallocate when there is no change
if (!changed)
void Cvar_Set(cvar_state_t *cvars, const char *var_name, const char *value)
{
cvar_t *var;
- var = Cvar_FindVar(cvars, var_name, ~0, false);
+ var = Cvar_FindVar(cvars, var_name, ~0);
if (var == NULL)
{
Con_Printf("Cvar_Set: variable %s not found\n", var_name);
Cvar_Set(cvars, var_name, val);
}
-void Cvar_RegisterCallback(cvar_t *var, void (*callback)(char *))
+void Cvar_RegisterCallback(cvar_t *variable, void (*callback)(char *))
{
- var->callback = callback;
+ variable->callback = callback;
}
-void Cvar_RegisterAlias(cvar_t *alias, cvar_t *target)
+void Cvar_RegisterAlias(cvar_t *variable, const char *alias )
{
- if(!(alias->flags & CVAR_ALIAS)) {
- Con_Warnf("Cvar_RegisterAlias: \"%s\" is not declared as an alias\n", alias->name);
- return;
- }
- // We'll want to register it first
- Cvar_RegisterVariable(alias);
+ cvar_state_t *cvars = &cvars_all;
+ cvar_hash_t *hash;
+ int hashindex;
+
+ variable->aliases = (char **)Mem_Realloc(zonemempool, variable->aliases, sizeof(char *) * (variable->aliasindex + 1));
+ // Add to it
+ variable->aliases[variable->aliasindex] = (char *)Z_Malloc(strlen(alias) + 1);
+ memcpy(variable->aliases[variable->aliasindex], alias, strlen(alias) + 1);
+ variable->aliasindex++;
- alias->alias = target;
+ // 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 *)alias, strlen(alias)) % CVAR_HASHSIZE;
+ hash->next = cvars->hashtable[hashindex];
+ cvars->hashtable[hashindex] = hash;
+ hash->cvar = variable;
}
/*
{
cvar_state_t *cvars = NULL;
int hashindex;
+ cvar_hash_t *hash;
cvar_t *current, *next, *cvar;
char *oldstr;
size_t alloclen;
int i;
- if(!(variable->flags & CVAR_ALIAS))
- {
- switch (variable->flags & (CVAR_CLIENT | CVAR_SERVER))
- {
- case CVAR_CLIENT:
- case CVAR_SERVER:
- case CVAR_CLIENT | CVAR_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);
- break;
- default:
- Sys_Error("Cvar_RegisterVariable({\"%s\", \"%s\", %i}) with weird CVAR_CLIENT | CVAR_SERVER flags\n", variable->name, variable->string, variable->flags);
- break;
- }
- }
- else
+ switch (variable->flags & (CVAR_CLIENT | CVAR_SERVER))
{
+ case CVAR_CLIENT:
+ case CVAR_SERVER:
+ case CVAR_CLIENT | CVAR_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);
+ break;
+ default:
+ Sys_Error("Cvar_RegisterVariable({\"%s\", \"%s\", %i}) with weird CVAR_CLIENT | CVAR_SERVER flags\n", variable->name, variable->string, variable->flags);
+ break;
}
-
+
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(cvars, variable->name, ~0, true);
+ cvar = Cvar_FindVar(cvars, variable->name, ~0);
if (cvar)
{
if (cvar->flags & CVAR_ALLOCATED)
Con_Printf("Cvar_RegisterVariable: %s is a command\n", variable->name);
return;
}
- if(!(variable->flags & CVAR_ALIAS))
- {
- // 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);
- variable->value = atof (variable->string);
- variable->integer = (int) variable->value;
- }
+
+// 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);
+ variable->value = atof (variable->string);
+ variable->integer = (int) variable->value;
+ variable->aliasindex = 0;
// Mark it as not an autocvar.
for (i = 0;i < PRVM_PROG_MAX;i++)
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;
- variable->nextonhashchain = cvars->hashtable[hashindex];
- cvars->hashtable[hashindex] = variable;
+ hash->next = cvars->hashtable[hashindex];
+ hash->cvar = variable;
+ cvars->hashtable[hashindex] = hash;
}
/*
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;
int i;
Con_DPrintf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags);
// first check to see if it has already been defined
- cvar = Cvar_FindVar(cvars, name, ~0, true);
+ cvar = Cvar_FindVar(cvars, name, ~0);
if (cvar)
{
cvar->flags |= flags;
cvar->defstring = (char *)Mem_strdup(zonemempool, value);
cvar->value = atof (cvar->string);
cvar->integer = (int) cvar->value;
+ cvar->aliases = (char **)Z_Malloc(sizeof(char **));
+ memset(cvar->aliases, 0, sizeof(char *));
if(newdescription && *newdescription)
cvar->description = (char *)Mem_strdup(zonemempool, newdescription);
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;
- cvar->nextonhashchain = cvars->hashtable[hashindex];
- cvars->hashtable[hashindex] = cvar;
+ hash->next = cvars->hashtable[hashindex];
+ cvars->hashtable[hashindex] = hash;
+ hash->cvar = cvar;
return cvar;
}
qboolean Cvar_Readonly (cvar_t *var, const char *cmd_name)
{
- if (var->flags & CVAR_READONLY || (var->alias && (var->alias->flags & CVAR_READONLY)))
+ if (var->flags & CVAR_READONLY)
{
if(cmd_name)
Con_Printf("%s: ",cmd_name);
Con_Printf("%s", var->name);
- if (var->alias && var->alias->name)
- Con_Printf(" (from %s)",var->alias->name);
Con_Printf(" is read-only\n");
return true;
}
cvar_t *v;
// check variables
- v = Cvar_FindVar(cvars, Cmd_Argv(cmd, 0), (cmd->cvars_flagsmask), true);
+ v = Cvar_FindVar(cvars, Cmd_Argv(cmd, 0), (cmd->cvars_flagsmask));
if (!v)
return false;
// perform a variable print or set
if (Cmd_Argc(cmd) == 1)
{
- Cvar_PrintHelp(v, true);
+ Cvar_PrintHelp(v, Cmd_Argv(cmd, 0), true);
return true;
}
cvar_t *var;
// unlock the default values of all cvars
for (var = cvars->vars ; var ; var = var->next)
- {
- if(var->flags & CVAR_ALIAS)
- continue;
var->flags &= ~CVAR_DEFAULTSET;
- }
}
// lock in the default values of all cvars
for (var = cvars->vars ; var ; var = var->next)
{
- if(var->flags & CVAR_ALIAS)
- continue;
if (!(var->flags & CVAR_DEFAULTSET))
{
size_t alloclen;
cvar_t *c;
for (c = cvars->vars;c;c = c->next)
{
- if(c->flags & CVAR_ALIAS)
- continue;
c->initstate = true;
c->initflags = c->flags;
c->initdefstring = Mem_strdup(zonemempool, c->defstring);
cvar_t *c2, **cp2;
for (cp = &cvars->vars;(c = *cp);)
{
- if(c->flags & CVAR_ALIAS)
- continue;
if (c->initstate)
{
// restore this cvar, it existed at init
Con_DPrintf("Cvar_RestoreInitState: Destroying cvar \"%s\"\n", c->name);
// unlink struct from hash
hashindex = CRC_Block((const unsigned char *)c->name, strlen(c->name)) % CVAR_HASHSIZE;
- for (cp2 = &cvars->hashtable[hashindex];(c2 = *cp2);)
+ for (cp2 = &cvars->hashtable[hashindex]->cvar;(c2 = *cp2);)
{
if (c2 == c)
{
- *cp2 = c2->nextonhashchain;
+ *cp2 = cvars->hashtable[hashindex]->next->cvar;
break;
}
else
- cp2 = &c2->nextonhashchain;
+ cp2 = &cvars->hashtable[hashindex]->next->cvar;
}
// unlink struct from main list
*cp = c->next;
// restore the default values of all cvars
for (var = cvars->vars ; var ; var = var->next)
{
- if(var->flags & CVAR_ALIAS)
- continue;
if((var->flags & CVAR_NORESETTODEFAULTS) == 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_ALIAS)
- continue;
if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == 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_ALIAS)
- continue;
if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == CVAR_SAVE)
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_ALIAS)
- continue;
if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || ((var->flags & CVAR_ALLOCATED) && !(var->flags & CVAR_DEFAULTSET))))
{
Cmd_QuoteString(buf1, sizeof(buf1), var->name, "\"\\$", false);
if (len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp (partial,cvar->name,len)))
continue;
- Cvar_PrintHelp(cvar, true);
+ Cvar_PrintHelp(cvar, cvar->name, true);
count++;
}
}
// check if it's read-only
- cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0, true);
+ cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0);
if (cvar)
if(Cvar_Readonly(cvar,"Set"))
return;
}
// check if it's read-only
- cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0, true);
+ cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0);
if (cvar)
if(Cvar_Readonly(cvar,"SetA"))
return;
cvar_state_t *cvars = cmd->cvars;
int neededflags = ~0;
int i;
- cvar_t *cvar, *parent, **link, *prev;
+ cvar_hash_t *hash, *parent, **link;
+ cvar_t *cvar, *prev;
if(Cmd_Argc(cmd) < 2)
{
}
for(i = 1; i < Cmd_Argc(cmd); ++i)
{
- cvar = Cvar_FindVarLink(cvars, Cmd_Argv(cmd, i), &parent, &link, &prev, neededflags);
+ hash = Cvar_FindVarLink(cvars, Cmd_Argv(cmd, i), &parent, &link, &prev, neededflags);
+ cvar = hash->cvar;
+
if(!cvar)
{
Con_Printf("%s: %s is not defined\n", Cmd_Argv(cmd, 0), Cmd_Argv(cmd, i));
}
if(parent)
- parent->nextonhashchain = cvar->nextonhashchain;
+ parent->next = hash->next;
else if(link)
- *link = cvar->nextonhashchain;
- if(!(cvar->flags & CVAR_ALIAS))
- {
- if(cvar->description != cvar_dummy_description)
- Z_Free((char *)cvar->description);
+ *link = hash->next;
+ 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((char *)cvar->name);
+ Z_Free((char *)cvar->string);
+ Z_Free((char *)cvar->defstring);
Z_Free(cvar);
}
}
buf[n] = 0;
for(var = cvars->vars; var; var = var->next)
{
- if(var->flags & CVAR_ALIAS)
- continue;
for(i = 0, p = buf, q = var->name; i < n; ++i)
{
*p++ = *q++;