X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cvar.c;h=5df43cc2726f989ad893c6530a76502284fec1ec;hb=ef23141bb91e4e7d6bc5b582398ae0aa62f95d04;hp=fb7cb18d097d77466c42c1636b160c2412eeff77;hpb=9d99863235967c28d77f1aee364cbdf96459bf5f;p=xonotic%2Fdarkplaces.git

diff --git a/cvar.c b/cvar.c
index fb7cb18d..5df43cc2 100644
--- a/cvar.c
+++ b/cvar.c
@@ -34,7 +34,7 @@ cvar_t *Cvar_FindVar (const char *var_name)
 	cvar_t *var;
 
 	for (var = cvar_vars;var;var = var->next)
-		if (!strcmp (var_name, var->name))
+		if (!strcasecmp (var_name, var->name))
 			return var;
 
 	return NULL;
@@ -95,6 +95,21 @@ const char *Cvar_VariableString (const char *var_name)
 	return var->string;
 }
 
+/*
+============
+Cvar_VariableDefString
+============
+*/
+const char *Cvar_VariableDefString (const char *var_name)
+{
+	cvar_t *var;
+
+	var = Cvar_FindVar (var_name);
+	if (!var)
+		return cvar_null_string;
+	return var->defstring;
+}
+
 
 /*
 ============
@@ -104,7 +119,7 @@ Cvar_CompleteVariable
 const char *Cvar_CompleteVariable (const char *partial)
 {
 	cvar_t		*cvar;
-	int			len;
+	size_t		len;
 
 	len = strlen(partial);
 
@@ -113,7 +128,7 @@ const char *Cvar_CompleteVariable (const char *partial)
 
 // check functions
 	for (cvar=cvar_vars ; cvar ; cvar=cvar->next)
-		if (!strncmp (partial,cvar->name, len))
+		if (!strncasecmp (partial,cvar->name, len))
 			return cvar->name;
 
 	return NULL;
@@ -131,7 +146,7 @@ const char *Cvar_CompleteVariable (const char *partial)
 int Cvar_CompleteCountPossible (const char *partial)
 {
 	cvar_t	*cvar;
-	int		len;
+	size_t	len;
 	int		h;
 
 	h = 0;
@@ -160,9 +175,9 @@ int Cvar_CompleteCountPossible (const char *partial)
 const char **Cvar_CompleteBuildList (const char *partial)
 {
 	const cvar_t *cvar;
-	int len = 0;
-	int bpos = 0;
-	int sizeofbuf = (Cvar_CompleteCountPossible (partial) + 1) * sizeof (const char *);
+	size_t len = 0;
+	size_t bpos = 0;
+	size_t sizeofbuf = (Cvar_CompleteCountPossible (partial) + 1) * sizeof (const char *);
 	const char **buf;
 
 	len = strlen(partial);
@@ -181,16 +196,10 @@ const char **Cvar_CompleteBuildList (const char *partial)
 Cvar_Set
 ============
 */
-void Cvar_SetQuick (cvar_t *var, const char *value)
+void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 {
 	qboolean changed;
 
-	if (var == NULL)
-	{
-		Con_Printf("Cvar_SetQuick: var == NULL\n");
-		return;
-	}
-
 	changed = strcmp(var->string, value);
 	// LordHavoc: don't reallocate when there is no change
 	if (!changed)
@@ -206,11 +215,22 @@ void Cvar_SetQuick (cvar_t *var, const char *value)
 	strcpy (var->string, value);
 	var->value = atof (var->string);
 	var->integer = (int) var->value;
-	if ((var->flags & CVAR_NOTIFY) && changed)
+	if ((var->flags & CVAR_NOTIFY) && changed && sv.active)
+		SV_BroadcastPrintf("\"%s\" changed to \"%s\"\n", var->name, var->string);
+}
+
+void Cvar_SetQuick (cvar_t *var, const char *value)
+{
+	if (var == NULL)
 	{
-		if (sv.active)
-			SV_BroadcastPrintf ("\"%s\" changed to \"%s\"\n", var->name, var->string);
+		Con_Print("Cvar_SetQuick: var == NULL\n");
+		return;
 	}
+
+	if (developer.integer)
+		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_Set (const char *var_name, const char *value)
@@ -219,16 +239,9 @@ void Cvar_Set (const char *var_name, const char *value)
 	var = Cvar_FindVar (var_name);
 	if (var == NULL)
 	{
-		// there is an error in C code if this happens
-		Con_Printf ("Cvar_Set: variable %s not found\n", var_name);
+		Con_Printf("Cvar_Set: variable %s not found\n", var_name);
 		return;
 	}
-	if (var->flags & CVAR_READONLY)
-	{
-		Con_Printf ("Cvar_Set: %s is read-only\n", var_name);
-		return;
-	}
-
 	Cvar_SetQuick(var, value);
 }
 
@@ -268,19 +281,59 @@ Adds a freestanding variable to the variable list.
 */
 void Cvar_RegisterVariable (cvar_t *variable)
 {
-	char	*oldstr;
+	cvar_t *current, *next, *cvar;
+	char *oldstr;
+
+	if (developer.integer)
+		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_FindVar (variable->name))
+	cvar = Cvar_FindVar (variable->name);
+	if (cvar)
 	{
-		Con_Printf ("Can't register variable %s, already defined\n", variable->name);
+		if (cvar->flags & CVAR_ALLOCATED)
+		{
+			if (developer.integer)
+				Con_Printf("...  replacing existing allocated cvar {\"%s\", \"%s\", %i}", cvar->name, cvar->string, cvar->flags);
+			// fixed variables replace allocated ones
+			// (because the engine directly accesses fixed variables)
+			// NOTE: this isn't actually used currently
+			// (all cvars are registered before config parsing)
+			variable->flags |= (cvar->flags & ~CVAR_ALLOCATED);
+			// cvar->string is now owned by variable instead
+			variable->string = cvar->string;
+			variable->defstring = cvar->defstring;
+			variable->value = atof (variable->string);
+			variable->integer = (int) variable->value;
+			// replace cvar with this one...
+			variable->next = cvar->next;
+			if (cvar_vars == cvar)
+			{
+				// head of the list is easy to change
+				cvar_vars = variable;
+			}
+			else
+			{
+				// otherwise find it somewhere in the list
+				for (current = cvar_vars;current->next != cvar;current = current->next)
+					;
+				current->next = variable;
+			}
+
+			// get rid of old allocated cvar
+			// (but not cvar->string and cvar->defstring, because we kept those)
+			Z_Free(cvar->name);
+			Z_Free(cvar);
+		}
+		else
+			Con_Printf("Can't register variable %s, already defined\n", variable->name);
 		return;
 	}
 
 // check for overlap with a command
 	if (Cmd_Exists (variable->name))
 	{
-		Con_Printf ("Cvar_RegisterVariable: %s is a command\n", variable->name);
+		Con_Printf("Cvar_RegisterVariable: %s is a command\n", variable->name);
 		return;
 	}
 
@@ -288,14 +341,82 @@ void Cvar_RegisterVariable (cvar_t *variable)
 	oldstr = variable->string;
 	variable->string = Z_Malloc (strlen(variable->string)+1);
 	strcpy (variable->string, oldstr);
+	variable->defstring = Z_Malloc (strlen(variable->string)+1);
+	strcpy (variable->defstring, oldstr);
 	variable->value = atof (variable->string);
 	variable->integer = (int) variable->value;
 
 // link the variable in
-	variable->next = cvar_vars;
-	cvar_vars = variable;
+// alphanumerical order
+	for( current = NULL, next = cvar_vars ; next && strcmp( next->name, variable->name ) < 0 ; current = next, next = next->next )
+		;
+	if( current ) {
+		current->next = variable;
+	} else {
+		cvar_vars = variable;
+	}
+	variable->next = next;
+}
+
+/*
+============
+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;
+
+	if (developer.integer)
+		Con_Printf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags);
+
+// first check to see if it has already been defined
+	cvar = Cvar_FindVar (name);
+	if (cvar)
+	{
+		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 = Z_Malloc(strlen(value) + 1);
+			strcpy(cvar->defstring, value);
+		}
+		return cvar;
+	}
+
+// check for overlap with a command
+	if (Cmd_Exists (name))
+	{
+		Con_Printf("Cvar_Get: %s is a command\n", name);
+		return NULL;
+	}
+
+// allocate a new cvar, cvar name, and cvar string
+// FIXME: these never get Z_Free'd
+	cvar = Z_Malloc(sizeof(cvar_t));
+	cvar->flags = flags | CVAR_ALLOCATED | CVAR_DEFAULTSET;
+	cvar->name = Z_Malloc(strlen(name)+1);
+	strcpy(cvar->name, name);
+	cvar->string = Z_Malloc(strlen(value)+1);
+	strcpy(cvar->string, value);
+	cvar->defstring = Z_Malloc(strlen(value)+1);
+	strcpy(cvar->defstring, value);
+	cvar->value = atof (cvar->string);
+	cvar->integer = (int) cvar->value;
+
+// link the variable in
+	cvar->next = cvar_vars;
+	cvar_vars = cvar;
+	return cvar;
 }
 
+
 /*
 ============
 Cvar_Command
@@ -315,10 +436,17 @@ qboolean	Cvar_Command (void)
 // perform a variable print or set
 	if (Cmd_Argc() == 1)
 	{
-		Con_Printf ("\"%s\" is \"%s\"\n", v->name, v->string);
+		Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, v->string, v->defstring);
 		return true;
 	}
 
+	Con_DPrint("Cvar_Command: ");
+
+	if (v->flags & CVAR_READONLY)
+	{
+		Con_Printf("%s is read-only\n", v->name);
+		return true;
+	}
 	Cvar_Set (v->name, Cmd_Argv(1));
 	return true;
 }
@@ -338,7 +466,7 @@ void Cvar_WriteVariables (qfile_t *f)
 
 	for (var = cvar_vars ; var ; var = var->next)
 		if (var->flags & CVAR_SAVE)
-			FS_Printf (f, "%s \"%s\"\n", var->name, var->string);
+			FS_Printf(f, "%s%s \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", var->name, var->string);
 }
 
 
@@ -353,7 +481,8 @@ void Cvar_List_f (void)
 {
 	cvar_t *cvar;
 	const char *partial;
-	int len, count;
+	size_t len;
+	int count;
 
 	if (Cmd_Argc() > 1)
 	{
@@ -369,17 +498,68 @@ void Cvar_List_f (void)
 	count = 0;
 	for (cvar = cvar_vars; cvar; cvar = cvar->next)
 	{
-		if (partial && strncmp (partial,cvar->name,len))
+		if (partial && strncasecmp (partial,cvar->name,len))
 			continue;
 
-		Con_Printf ("%s is \"%s\"\n", cvar->name, cvar->string);
+		Con_Printf("%s is \"%s\" [\"%s\"]\n", cvar->name, cvar->string, cvar->defstring);
 		count++;
 	}
 
-	Con_Printf ("%i cvar(s)", count);
+	Con_Printf("%i cvar(s)", count);
 	if (partial)
-		Con_Printf (" beginning with \"%s\"", partial);
-	Con_Printf ("\n");
+		Con_Printf(" beginning with \"%s\"", partial);
+	Con_Print("\n");
 }
 // 2000-01-09 CvarList command by Maddes
 
+void Cvar_Set_f (void)
+{
+	cvar_t *cvar;
+
+	// 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");
+		return;
+	}
+
+	// check if it's read-only
+	cvar = Cvar_FindVar(Cmd_Argv(1));
+	if (cvar && cvar->flags & CVAR_READONLY)
+	{
+		Con_Printf("Set: %s is read-only\n", cvar->name);
+		return;
+	}
+
+	Con_DPrint("Set: ");
+
+	// all looks ok, create/modify the cvar
+	Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), 0);
+}
+
+void Cvar_SetA_f (void)
+{
+	cvar_t *cvar;
+
+	// 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");
+		return;
+	}
+
+	// check if it's read-only
+	cvar = Cvar_FindVar(Cmd_Argv(1));
+	if (cvar && cvar->flags & CVAR_READONLY)
+	{
+		Con_Printf("SetA: %s is read-only\n", cvar->name);
+		return;
+	}
+
+	Con_DPrint("SetA: ");
+
+	// all looks ok, create/modify the cvar
+	Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), CVAR_SAVE);
+}
+
+