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;
// 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;
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;
+ 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;
}
/*
void Cvar_PrintHelp(cvar_t *cvar, const char *name, qboolean full)
{
- Con_Printf("^3%s^7", name);
+ // Aliases are purple, cvars are yellow
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);
-
+ Con_Printf("^6");
+ else
+ Con_Printf("^3");
+ Con_Printf("%s^7 is \"%s\" [\"%s\"]", name, ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring);
+ if (strcmp(cvar->name, name))
+ Con_Printf(" (also ^3%s^7)", cvar->name);
if (full)
- Con_Printf("%s", cvar->description);
+ Con_Printf(" %s", cvar->description);
Con_Printf("\n");
}
extern cvar_t sv_disablenotify;
static void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
{
- cvar_state_t *cvars = &cvars_all;
qboolean changed;
size_t valuelen;
- char vabuf[1024];
- 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)
- SV_BroadcastPrintf("\001^3Server cvar \"%s\" changed to \"%s\"\n", var->name, var->string);
+ 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)
}
}
#endif
- if ((var->flags & CVAR_USERINFO) && cls.state != ca_dedicated)
+ if (var->flags & CVAR_USERINFO)
CL_SetInfo(var->name, var->string, true, false, false, false);
- else if ((var->flags & CVAR_NQUSERINFOHACK) && cls.state != ca_dedicated)
- {
- // update the cls.userinfo to have proper values for the
- // silly nq config variables.
- //
- // this is done when these variables are changed rather than at
- // connect time because if the user or code checks the userinfo and it
- // holds weird values it may cause confusion...
- if (!strcmp(var->name, "_cl_color"))
- {
- int top = (var->integer >> 4) & 15, bottom = var->integer & 15;
- CL_SetInfo("topcolor", va(vabuf, sizeof(vabuf), "%i", top), true, false, false, false);
- CL_SetInfo("bottomcolor", va(vabuf, sizeof(vabuf), "%i", bottom), true, false, false, false);
- if (cls.protocol != PROTOCOL_QUAKEWORLD && cls.netcon)
- {
- MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
- MSG_WriteString(&cls.netcon->message, va(vabuf, sizeof(vabuf), "color %i %i", top, bottom));
- }
- }
- else if (!strcmp(var->name, "_cl_rate"))
- CL_SetInfo("rate", va(vabuf, sizeof(vabuf), "%i", var->integer), true, false, false, false);
- else if (!strcmp(var->name, "_cl_rate_burstsize"))
- CL_SetInfo("rate_burstsize", va(vabuf, sizeof(vabuf), "%i", var->integer), true, false, false, false);
- else if (!strcmp(var->name, "_cl_playerskin"))
- CL_SetInfo("playerskin", var->string, true, false, false, false);
- else if (!strcmp(var->name, "_cl_playermodel"))
- CL_SetInfo("playermodel", var->string, true, false, false, false);
- else if (!strcmp(var->name, "_cl_name"))
- CL_SetInfo("name", var->string, true, false, false, false);
- else if (!strcmp(var->name, "rcon_secure"))
- {
- // 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 <= 0)
- Cvar_Set(cvars, "rcon_password", "");
- }
-#ifdef CONFIG_MENU
- else if (!strcmp(var->name, "net_slist_favorites"))
- NetConn_UpdateFavorites();
-#endif
- }
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)
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
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;
}
cvar_state_t *cvars = cmd->cvars;
cvar_t *cvar;
const char *partial;
- size_t len;
int count;
qboolean ispattern;
+ char vabuf[1024];
if (Cmd_Argc(cmd) > 1)
{
partial = Cmd_Argv(cmd, 1);
- len = strlen(partial);
ispattern = (strchr(partial, '*') || strchr(partial, '?'));
+ if(!ispattern)
+ partial = va(vabuf, sizeof(vabuf), "%s*", partial);
}
else
{
- partial = NULL;
- len = 0;
+ partial = va(vabuf, sizeof(vabuf), "*");
ispattern = false;
}
count = 0;
for (cvar = cvars->vars; cvar; cvar = cvar->next)
{
- if (len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp (partial,cvar->name,len)))
- continue;
-
- Cvar_PrintHelp(cvar, cvar->name, true);
- count++;
+ if (matchpattern_with_separator(cvar->name, partial, false, "", false))
+ {
+ Cvar_PrintHelp(cvar, cvar->name, true);
+ count++;
+ }
+ for (int i = 0; i < cvar->aliasindex; i++)
+ {
+ if (matchpattern_with_separator(cvar->aliases[i], partial, false, "", false))
+ {
+ Cvar_PrintHelp(cvar, cvar->aliases[i], true);
+ count++;
+ }
+ }
}
- if (len)
+ if (Cmd_Argc(cmd) > 1)
{
if(ispattern)
Con_Printf("%i cvar%s matching \"%s\"\n", count, (count > 1) ? "s" : "", partial);
else
- Con_Printf("%i cvar%s beginning with \"%s\"\n", count, (count > 1) ? "s" : "", partial);
+ Con_Printf("%i cvar%s beginning with \"%s\"\n", count, (count > 1) ? "s" : "", Cmd_Argv(cmd,1));
}
else
Con_Printf("%i cvar(s)\n", count);
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(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);
projects / xonotic / darkplaces.git / blobdiff