#include "quakedef.h"
cvar_t *cvar_vars = NULL;
+cvar_t *cvar_hashtable[65536];
char *cvar_null_string = "";
/*
*/
cvar_t *Cvar_FindVar (const char *var_name)
{
+ int hashindex;
cvar_t *var;
- for (var = cvar_vars;var;var = var->next)
+ // use hash lookup to minimize search time
+ hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name));
+ for (var = cvar_hashtable[hashindex];var;var = var->nextonhashchain)
if (!strcasecmp (var_name, var->name))
return var;
// Loop through the command list and print all matches
for (cvar = cvar_vars; cvar; cvar = cvar->next)
if (!strncasecmp(partial, cvar->name, len))
- Con_Printf("%s : \"%s\" (\"%s\") : %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description);
+ Con_Printf ("%c3%s%s : \"%s\" (\"%s\") : %s\n", STRING_COLOR_TAG, cvar->name, STRING_COLOR_DEFAULT_STR, cvar->string, cvar->defstring, cvar->description);
}
}
}
#endif
- if ((var->flags & CVAR_USERINFO) && changed && cls.state != ca_dedicated)
- {
- InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), var->name, var->string);
- if (cls.state == ca_connected)
- Cmd_ForwardStringToServer(va("setinfo \"%s\" \"%s\"\n", var->name, var->string));
- }
+ if ((var->flags & CVAR_USERINFO) && cls.state != ca_dedicated)
+ CL_SetInfo(var->name, var->string, true, false, false, false);
}
void Cvar_SetQuick (cvar_t *var, const char *value)
return;
}
- if (developer.integer)
+ if (developer.integer >= 100)
Con_Printf("Cvar_SetQuick({\"%s\", \"%s\", %i, \"%s\"}, \"%s\");\n", var->name, var->string, var->flags, var->defstring, value);
Cvar_SetQuick_Internal(var, value);
*/
void Cvar_RegisterVariable (cvar_t *variable)
{
+ int hashindex;
cvar_t *current, *next, *cvar;
char *oldstr;
- if (developer.integer)
+ if (developer.integer >= 100)
Con_Printf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags);
// first check to see if it has already been defined
{
if (cvar->flags & CVAR_ALLOCATED)
{
- if (developer.integer)
+ if (developer.integer >= 100)
Con_Printf("... replacing existing allocated cvar {\"%s\", \"%s\", %i}\n", cvar->name, cvar->string, cvar->flags);
// fixed variables replace allocated ones
// (because the engine directly accesses fixed variables)
cvar_vars = variable;
}
variable->next = next;
+
+ // link to head of list in this hash table index
+ hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name));
+ variable->nextonhashchain = cvar_hashtable[hashindex];
+ cvar_hashtable[hashindex] = variable;
}
/*
*/
cvar_t *Cvar_Get (const char *name, const char *value, int flags)
{
- cvar_t *cvar;
+ int hashindex;
+ cvar_t *current, *next, *cvar;
- if (developer.integer)
+ if (developer.integer >= 100)
Con_Printf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags);
// first check to see if it has already been defined
{
cvar->flags |= flags;
Cvar_SetQuick_Internal (cvar, value);
- // also set the default value (but only once)
- if (~cvar->flags & CVAR_DEFAULTSET)
- {
- cvar->flags |= CVAR_DEFAULTSET;
-
- Z_Free(cvar->defstring);
- cvar->defstring = (char *)Z_Malloc(strlen(value) + 1);
- strcpy(cvar->defstring, value);
- }
return cvar;
}
// allocate a new cvar, cvar name, and cvar string
// FIXME: these never get Z_Free'd
cvar = (cvar_t *)Z_Malloc(sizeof(cvar_t));
- cvar->flags = flags | CVAR_ALLOCATED | CVAR_DEFAULTSET;
+ cvar->flags = flags | CVAR_ALLOCATED;
cvar->name = (char *)Z_Malloc(strlen(name)+1);
strcpy(cvar->name, name);
cvar->string = (char *)Z_Malloc(strlen(value)+1);
cvar->description = "custom cvar";
// link the variable in
- cvar->next = cvar_vars;
- cvar_vars = cvar;
+// alphanumerical order
+ for( current = NULL, next = cvar_vars ; next && strcmp( next->name, cvar->name ) < 0 ; current = next, next = next->next )
+ ;
+ if( current )
+ current->next = cvar;
+ else
+ cvar_vars = cvar;
+ cvar->next = next;
+
+ // link to head of list in this hash table index
+ hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name));
+ cvar->nextonhashchain = cvar_hashtable[hashindex];
+ cvar_hashtable[hashindex] = cvar;
+
return cvar;
}
return true;
}
- Con_DPrint("Cvar_Command: ");
+ if (developer.integer >= 100)
+ Con_DPrint("Cvar_Command: ");
if (v->flags & CVAR_READONLY)
{
return true;
}
Cvar_Set (v->name, Cmd_Argv(1));
+ if (developer.integer >= 100)
+ Con_DPrint("\n");
return true;
}
+void Cvar_LockDefaults_f (void)
+{
+ cvar_t *var;
+ // lock in the default values of all cvars
+ for (var = cvar_vars ; var ; var = var->next)
+ {
+ if (!(var->flags & CVAR_DEFAULTSET))
+ {
+ //Con_Printf("locking cvar %s (%s -> %s)\n", var->name, var->string, var->defstring);
+ var->flags |= CVAR_DEFAULTSET;
+ Z_Free(var->defstring);
+ var->defstring = (char *)Z_Malloc(strlen(var->string) + 1);
+ strcpy(var->defstring, var->string);
+ }
+ }
+}
+
+
+void Cvar_ResetToDefaults_All_f (void)
+{
+ cvar_t *var;
+ // restore the default values of all cvars
+ for (var = cvar_vars ; var ; var = var->next)
+ Cvar_SetQuick(var, var->defstring);
+}
+
+
+void Cvar_ResetToDefaults_NoSaveOnly_f (void)
+{
+ cvar_t *var;
+ // restore the default values of all cvars
+ for (var = cvar_vars ; var ; var = var->next)
+ if (!(var->flags & CVAR_SAVE))
+ Cvar_SetQuick(var, var->defstring);
+}
+
+
+void Cvar_ResetToDefaults_SaveOnly_f (void)
+{
+ cvar_t *var;
+ // restore the default values of all cvars
+ for (var = cvar_vars ; var ; var = var->next)
+ if (var->flags & CVAR_SAVE)
+ Cvar_SetQuick(var, var->defstring);
+}
+
+
/*
============
Cvar_WriteVariables
{
cvar_t *var;
+ // don't save cvars that match their default value
for (var = cvar_vars ; var ; var = var->next)
- if (var->flags & CVAR_SAVE)
+ if (var->flags & CVAR_SAVE && strcmp(var->string, var->defstring))
FS_Printf(f, "%s%s \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", var->name, var->string);
}
projects / xonotic / darkplaces.git / blobdiff