Cvar_FindVar
============
*/
-cvar_t *Cvar_FindVar(cvar_state_t *cvars, const char *var_name, int neededflags)
+cvar_t *Cvar_FindVar(cvar_state_t *cvars, const char *var_name, int neededflags, qboolean alias)
{
int hashindex;
cvar_t *var;
// 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) && (var->flags & neededflags))
+ if (!strcmp (var_name, var->name))
+ {
+ if(!alias && var->alias)
+ return var->alias;
return var;
-
+ }
return NULL;
}
if (*prev_var_name)
{
- var = Cvar_FindVar(cvars, prev_var_name, neededflags);
+ var = Cvar_FindVar(cvars, prev_var_name, neededflags, false);
if (!var)
return NULL;
var = var->next;
{
cvar_t *var;
- var = Cvar_FindVar(cvars, var_name, neededflags);
+ var = Cvar_FindVar(cvars, var_name, neededflags, false);
if (!var)
return def;
return atof (var->string);
{
cvar_t *var;
- var = Cvar_FindVar(cvars, var_name, neededflags);
+ var = Cvar_FindVar(cvars, var_name, neededflags, false);
if (!var)
return def;
return var->string;
{
cvar_t *var;
- var = Cvar_FindVar(cvars, var_name, neededflags);
+ var = Cvar_FindVar(cvars, var_name, neededflags, false);
if (!var)
return cvar_null_string;
return var->defstring;
{
cvar_t *var;
- var = Cvar_FindVar(cvars, var_name, neededflags);
+ var = Cvar_FindVar(cvars, var_name, neededflags, false);
if (!var)
return cvar_null_string;
return var->description;
return buf;
}
+void Cvar_PrintHelp(cvar_t *cvar, 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);
+
+ if (full)
+ Con_Printf("%s", cvar_actual->description);
+ Con_Printf("\n");
+}
+
// written by LadyHavoc
void Cvar_CompleteCvarPrint(cvar_state_t *cvars, const char *partial, int neededflags)
{
// 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))
- Con_Printf ("^3%s^7 is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description);
+ Cvar_PrintHelp(cvar, true);
}
// check if a cvar is held by some progs
qboolean changed;
size_t valuelen;
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)
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(value);
+ valuelen = strlen(new_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, value, valuelen + 1);
+ memcpy ((char *)var->string, new_value, valuelen + 1);
var->value = atof (var->string);
var->integer = (int) var->value;
if ((var->flags & CVAR_NOTIFY) && changed && sv.active && !sv_disablenotify.integer)
- SV_BroadcastPrintf("\"%s\" changed to \"%s\"\n", var->name, var->string);
+ SV_BroadcastPrintf("\001^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)
void Cvar_Set(cvar_state_t *cvars, const char *var_name, const char *value)
{
cvar_t *var;
- var = Cvar_FindVar(cvars, var_name, ~0);
+ var = Cvar_FindVar(cvars, var_name, ~0, false);
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 *))
+{
+ var->callback = callback;
+}
+
+void Cvar_RegisterAlias(cvar_t *alias, cvar_t *target)
+{
+ 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);
+
+ alias->alias = target;
+}
+
/*
============
Cvar_RegisterVariable
size_t alloclen;
int i;
- switch (variable->flags & (CVAR_CLIENT | CVAR_SERVER))
+ 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
{
- 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);
+ cvar = Cvar_FindVar(cvars, variable->name, ~0, true);
if (cvar)
{
if (cvar->flags & CVAR_ALLOCATED)
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);
- variable->value = atof (variable->string);
- variable->integer = (int) variable->value;
+ 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;
+ }
// Mark it as not an autocvar.
for (i = 0;i < PRVM_PROG_MAX;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);
+ cvar = Cvar_FindVar(cvars, name, ~0, true);
if (cvar)
{
cvar->flags |= flags;
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(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;
+ }
+ return false;
+}
/*
============
cvar_t *v;
// check variables
- v = Cvar_FindVar(cvars, Cmd_Argv(cmd, 0), cmd->cvars_flagsmask);
+ v = Cvar_FindVar(cvars, Cmd_Argv(cmd, 0), (cmd->cvars_flagsmask), true);
if (!v)
return false;
// perform a variable print or set
if (Cmd_Argc(cmd) == 1)
{
- Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, ((v->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : v->string), v->defstring);
+ Cvar_PrintHelp(v, true);
return true;
}
if (developer_extra.integer)
Con_DPrint("Cvar_Command: ");
-
- if (v->flags & CVAR_READONLY)
- {
- Con_Printf("%s is read-only\n", v->name);
+
+ if(Cvar_Readonly(v, NULL))
return true;
- }
+
Cvar_SetQuick(v, Cmd_Argv(cmd, 1));
if (developer_extra.integer)
Con_DPrint("\n");
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
cvar_t *var;
// 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);
+ }
}
cvar_t *var;
// 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);
+ }
}
cvar_t *var;
// 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);
+ }
}
char buf1[MAX_INPUTLINE], buf2[MAX_INPUTLINE];
// don't save cvars that match their default value
- for (var = cvars->vars ; var ; var = var->next)
+ 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);
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->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring, cvar->description);
+ Cvar_PrintHelp(cvar, true);
count++;
}
}
// check if it's read-only
- cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0);
- if (cvar && cvar->flags & CVAR_READONLY)
- {
- Con_Printf("Set: %s is read-only\n", cvar->name);
- return;
- }
+ cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0, true);
+ if (cvar)
+ if(Cvar_Readonly(cvar,"Set"))
+ return;
if (developer_extra.integer)
Con_DPrint("Set: ");
}
// check if it's read-only
- cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0);
- if (cvar && cvar->flags & CVAR_READONLY)
- {
- Con_Printf("SetA: %s is read-only\n", cvar->name);
- return;
- }
+ cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0, true);
+ if (cvar)
+ if(Cvar_Readonly(cvar,"SetA"))
+ return;
if (developer_extra.integer)
Con_DPrint("SetA: ");
Con_Printf("%s: %s is not defined\n", Cmd_Argv(cmd, 0), Cmd_Argv(cmd, i));
continue;
}
- if(cvar->flags & CVAR_READONLY)
- {
- Con_Printf("%s: %s is read-only\n", Cmd_Argv(cmd, 0), cvar->name);
+ if(Cvar_Readonly(cvar, Cmd_Argv(cmd, 0)))
continue;
- }
if(!(cvar->flags & CVAR_ALLOCATED))
{
Con_Printf("%s: %s is static and cannot be deleted\n", Cmd_Argv(cmd, 0), cvar->name);
parent->nextonhashchain = cvar->nextonhashchain;
else if(link)
*link = cvar->nextonhashchain;
+ if(!(cvar->flags & CVAR_ALIAS))
+ {
+ if(cvar->description != cvar_dummy_description)
+ Z_Free((char *)cvar->description);
- 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++;
projects / xonotic / darkplaces.git / blobdiff