X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cvar.c;h=47a5735ddeb16477d6bcd2dd8992feb42de12ce8;hb=814920dd2f335b4451c58bbdde00d27d3cd783a6;hp=beee7212e35d8decfee66aa7c7885085f1fc2562;hpb=a7cc13d2f12eedcaa354066f531fb1529e204784;p=xonotic%2Fdarkplaces.git

diff --git a/cvar.c b/cvar.c
index beee7212..47a5735d 100644
--- a/cvar.c
+++ b/cvar.c
@@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
+char *cvar_dummy_description = "custom cvar";
+
 cvar_t *cvar_vars = NULL;
 cvar_t *cvar_hashtable[65536];
 char *cvar_null_string = "";
@@ -38,7 +40,7 @@ cvar_t *Cvar_FindVar (const char *var_name)
 	// 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;
@@ -114,6 +116,21 @@ const char *Cvar_VariableDefString (const char *var_name)
 	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;
+}
+
 
 /*
 ============
@@ -316,9 +333,9 @@ void Cvar_SetValueQuick(cvar_t *var, float 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);
 }
 
@@ -327,9 +344,9 @@ void Cvar_SetValue(const char *var_name, float 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_Set(var_name, val);
 }
 
@@ -434,7 +451,7 @@ Cvar_Get
 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;
@@ -449,6 +466,20 @@ cvar_t *Cvar_Get (const char *name, const char *value, int 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;
 	}
 
@@ -474,7 +505,15 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags)
 	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
@@ -624,6 +663,7 @@ void Cvar_List_f (void)
 	const char *partial;
 	size_t len;
 	int count;
+	qboolean ispattern;
 
 	if (Cmd_Argc() > 1)
 	{
@@ -636,18 +676,25 @@ void Cvar_List_f (void)
 		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);
 }
@@ -660,7 +707,7 @@ void Cvar_Set_f (void)
 	// 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;
 	}
 
@@ -672,10 +719,11 @@ void Cvar_Set_f (void)
 		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)
@@ -685,7 +733,7 @@ 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;
 	}
 
@@ -697,10 +745,11 @@ void Cvar_SetA_f (void)
 		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);
 }