#include "quakedef.h"
+char *cvar_dummy_description = "custom cvar";
+
cvar_t *cvar_vars = NULL;
cvar_t *cvar_hashtable[65536];
char *cvar_null_string = "";
// 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))
+ if (!strcmp (var_name, var->name))
return var;
return NULL;
return var->defstring;
}
+/*
+============
+Cvar_VariableDescription
+============
+*/
+const char *Cvar_VariableDescription (const char *var_name)
+{
+ cvar_t *var;
+
+ var = Cvar_FindVar (var_name);
+ if (!var)
+ return cvar_null_string;
+ return var->description;
+}
+
/*
============
void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
{
qboolean changed;
+ size_t valuelen;
changed = strcmp(var->string, value);
// LordHavoc: don't reallocate when there is no change
return;
// LordHavoc: don't reallocate when the buffer is the same size
- if (!var->string || strlen(var->string) != strlen(value))
+ valuelen = strlen(value);
+ if (!var->string || strlen(var->string) != valuelen)
{
Z_Free (var->string); // free the old value string
- var->string = (char *)Z_Malloc (strlen(value)+1);
+ var->string = (char *)Z_Malloc (valuelen + 1);
}
- strcpy (var->string, value);
+ memcpy (var->string, value, valuelen + 1);
var->value = atof (var->string);
var->integer = (int) var->value;
if ((var->flags & CVAR_NOTIFY) && changed && sv.active)
#endif
if ((var->flags & CVAR_USERINFO) && cls.state != ca_dedicated)
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("%i", top), true, false, false, false);
+ CL_SetInfo("bottomcolor", va("%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("color %i %i", top, bottom));
+ }
+ }
+ else if (!strcmp(var->name, "_cl_rate"))
+ CL_SetInfo("rate", va("%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);
+ }
}
void Cvar_SetQuick (cvar_t *var, const char *value)
char val[MAX_INPUTLINE];
if ((float)((int)value) == value)
- sprintf(val, "%i", (int)value);
+ dpsnprintf(val, sizeof(val), "%i", (int)value);
else
- sprintf(val, "%f", value);
+ dpsnprintf(val, sizeof(val), "%f", value);
Cvar_SetQuick(var, val);
}
char val[MAX_INPUTLINE];
if ((float)((int)value) == value)
- sprintf(val, "%i", (int)value);
+ dpsnprintf(val, sizeof(val), "%i", (int)value);
else
- sprintf(val, "%f", value);
+ dpsnprintf(val, sizeof(val), "%f", value);
Cvar_Set(var_name, val);
}
int hashindex;
cvar_t *current, *next, *cvar;
char *oldstr;
+ size_t alloclen;
if (developer.integer >= 100)
Con_Printf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags);
// copy the value off, because future sets will Z_Free it
oldstr = variable->string;
- variable->string = (char *)Z_Malloc (strlen(variable->string)+1);
- strcpy (variable->string, oldstr);
- variable->defstring = (char *)Z_Malloc (strlen(variable->string)+1);
- strcpy (variable->defstring, oldstr);
+ alloclen = strlen(variable->string) + 1;
+ variable->string = (char *)Z_Malloc (alloclen);
+ memcpy (variable->string, oldstr, alloclen);
+ variable->defstring = (char *)Z_Malloc (alloclen);
+ memcpy (variable->defstring, oldstr, alloclen);
variable->value = atof (variable->string);
variable->integer = (int) variable->value;
Adds a newly allocated variable to the variable list or sets its value.
============
*/
-cvar_t *Cvar_Get (const char *name, const char *value, int flags)
+cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *newdescription)
{
int hashindex;
cvar_t *current, *next, *cvar;
+ size_t alloclen;
if (developer.integer >= 100)
Con_Printf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags);
{
cvar->flags |= flags;
Cvar_SetQuick_Internal (cvar, value);
+ if(newdescription && (cvar->flags & CVAR_ALLOCATED))
+ {
+ if(cvar->description != cvar_dummy_description)
+ Z_Free(cvar->description);
+
+ if(*newdescription)
+ {
+ alloclen = strlen(newdescription) + 1;
+ cvar->description = (char *)Z_Malloc(alloclen);
+ memcpy(cvar->description, newdescription, alloclen);
+ }
+ else
+ cvar->description = cvar_dummy_description;
+ }
return cvar;
}
}
// allocate a new cvar, cvar name, and cvar string
+// 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->name = (char *)Z_Malloc(strlen(name)+1);
- strcpy(cvar->name, name);
- cvar->string = (char *)Z_Malloc(strlen(value)+1);
- strcpy(cvar->string, value);
- cvar->defstring = (char *)Z_Malloc(strlen(value)+1);
- strcpy(cvar->defstring, value);
+ alloclen = strlen(name) + 1;
+ cvar->name = (char *)Z_Malloc(alloclen);
+ memcpy(cvar->name, name, alloclen);
+ alloclen = strlen(value) + 1;
+ cvar->string = (char *)Z_Malloc(alloclen);
+ memcpy(cvar->string, value, alloclen);
+ cvar->defstring = (char *)Z_Malloc(alloclen);
+ memcpy(cvar->defstring, value, alloclen);
cvar->value = atof (cvar->string);
cvar->integer = (int) cvar->value;
- cvar->description = "custom cvar";
+
+ if(newdescription && *newdescription)
+ {
+ alloclen = strlen(newdescription) + 1;
+ cvar->description = (char *)Z_Malloc(alloclen);
+ memcpy(cvar->description, newdescription, alloclen);
+ }
+ else
+ cvar->description = cvar_dummy_description; // actually checked by VM_cvar_type
// link the variable in
// alphanumerical order
}
+void Cvar_UnlockDefaults (void)
+{
+ cvar_t *var;
+ // unlock the default values of all cvars
+ for (var = cvar_vars ; var ; var = var->next)
+ var->flags &= ~CVAR_DEFAULTSET;
+}
+
+
void Cvar_LockDefaults_f (void)
{
cvar_t *var;
{
if (!(var->flags & CVAR_DEFAULTSET))
{
+ size_t alloclen;
+
//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);
+ alloclen = strlen(var->string) + 1;
+ var->defstring = (char *)Z_Malloc(alloclen);
+ memcpy(var->defstring, var->string, alloclen);
}
}
}
// don't save cvars that match their default value
for (var = cvar_vars ; var ; var = var->next)
- if (var->flags & CVAR_SAVE && strcmp(var->string, var->defstring))
+ if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || (var->flags & CVAR_ALLOCATED)))
FS_Printf(f, "%s%s \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", var->name, var->string);
}
const char *partial;
size_t len;
int count;
+ qboolean ispattern;
if (Cmd_Argc() > 1)
{
len = 0;
}
+ ispattern = partial && (strchr(partial, '*') || strchr(partial, '?'));
+
count = 0;
for (cvar = cvar_vars; cvar; cvar = cvar->next)
{
- if (partial && strncasecmp (partial,cvar->name,len))
+ 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->string, cvar->defstring, cvar->description);
count++;
}
- if (partial)
- Con_Printf("%i cvar(s) beginning with \"%s\"\n", count, partial);
+ if (len)
+ {
+ if(ispattern)
+ Con_Printf("%i cvar(s) matching \"%s\"\n", count, partial);
+ else
+ Con_Printf("%i cvar(s) beginning with \"%s\"\n", count, partial);
+ }
else
Con_Printf("%i cvar(s)\n", count);
}
// make sure it's the right number of parameters
if (Cmd_Argc() < 3)
{
- Con_Printf("Set: wrong number of parameters, usage: set <variablename> <value>\n");
+ Con_Printf("Set: wrong number of parameters, usage: set <variablename> <value> [<description>]\n");
return;
}
return;
}
- Con_DPrint("Set: ");
+ if (developer.integer >= 100)
+ Con_DPrint("Set: ");
// all looks ok, create/modify the cvar
- Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), 0);
+ Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), 0, Cmd_Argc() > 3 ? Cmd_Argv(3) : NULL);
}
void Cvar_SetA_f (void)
// make sure it's the right number of parameters
if (Cmd_Argc() < 3)
{
- Con_Printf("SetA: wrong number of parameters, usage: seta <variablename> <value>\n");
+ Con_Printf("SetA: wrong number of parameters, usage: seta <variablename> <value> [<description>]\n");
return;
}
return;
}
- Con_DPrint("SetA: ");
+ if (developer.integer >= 100)
+ Con_DPrint("SetA: ");
// all looks ok, create/modify the cvar
- Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), CVAR_SAVE);
+ Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), CVAR_SAVE, Cmd_Argc() > 3 ? Cmd_Argv(3) : NULL);
}
projects / xonotic / darkplaces.git / blobdiff