X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cvar.c;h=68d98df421f1ebb41d20b2c84cce70f35e3d8207;hb=fc39109e7d165c83de276dbd5e9fcbbdfcd12c3d;hp=4274203e5937148dce7e46115e8063ad6ce853c6;hpb=4dd7379ea0e0af75a0c3f2ea006e008039566134;p=xonotic%2Fdarkplaces.git

diff --git a/cvar.c b/cvar.c
index 4274203e..68d98df4 100644
--- a/cvar.c
+++ b/cvar.c
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 
 cvar_t *cvar_vars = NULL;
+cvar_t *cvar_hashtable[65536];
 char *cvar_null_string = "";
 
 /*
@@ -31,9 +32,12 @@ Cvar_FindVar
 */
 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;
 
@@ -95,6 +99,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 +123,7 @@ Cvar_CompleteVariable
 const char *Cvar_CompleteVariable (const char *partial)
 {
 	cvar_t		*cvar;
-	int			len;
+	size_t		len;
 
 	len = strlen(partial);
 
@@ -131,7 +150,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,13 +179,13 @@ 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);
-	buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *));
+	buf = (const char **)Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *));
 	// Loop through the alias list and print all matches
 	for (cvar = cvar_vars; cvar; cvar = cvar->next)
 		if (!strncasecmp(partial, cvar->name, len))
@@ -176,6 +195,18 @@ const char **Cvar_CompleteBuildList (const char *partial)
 	return buf;
 }
 
+// written by LordHavoc
+void Cvar_CompleteCvarPrint (const char *partial)
+{
+	cvar_t *cvar;
+	size_t len = strlen(partial);
+	// 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 ("%c3%s%s : \"%s\" (\"%s\") : %s\n", STRING_COLOR_TAG, cvar->name, STRING_COLOR_DEFAULT_STR, cvar->string, cvar->defstring, cvar->description);
+}
+
+
 /*
 ============
 Cvar_Set
@@ -195,13 +226,28 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 	{
 		Z_Free (var->string);	// free the old value string
 
-		var->string = Z_Malloc (strlen(value)+1);
+		var->string = (char *)Z_Malloc (strlen(value)+1);
 	}
 	strcpy (var->string, value);
 	var->value = atof (var->string);
 	var->integer = (int) var->value;
 	if ((var->flags & CVAR_NOTIFY) && changed && sv.active)
 		SV_BroadcastPrintf("\"%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)
+	{
+		InfoString_SetValue(svs.serverinfo, sizeof(svs.serverinfo), var->name, var->string);
+		if (sv.active)
+		{
+			MSG_WriteByte (&sv.reliable_datagram, svc_serverinfostring);
+			MSG_WriteString (&sv.reliable_datagram, var->name);
+			MSG_WriteString (&sv.reliable_datagram, var->string);
+		}
+	}
+#endif
+	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)
@@ -212,8 +258,8 @@ void Cvar_SetQuick (cvar_t *var, const char *value)
 		return;
 	}
 
-	if (developer.integer)
-		Con_Printf("Cvar_SetQuick({\"%s\", \"%s\", %i}, \"%s\");\n", var->name, var->string, var->flags, value);
+	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);
 }
@@ -237,7 +283,7 @@ Cvar_SetValue
 */
 void Cvar_SetValueQuick(cvar_t *var, float value)
 {
-	char val[256];
+	char val[MAX_INPUTLINE];
 
 	if ((float)((int)value) == value)
 		sprintf(val, "%i", (int)value);
@@ -248,7 +294,7 @@ void Cvar_SetValueQuick(cvar_t *var, float value)
 
 void Cvar_SetValue(const char *var_name, float value)
 {
-	char val[256];
+	char val[MAX_INPUTLINE];
 
 	if ((float)((int)value) == value)
 		sprintf(val, "%i", (int)value);
@@ -266,10 +312,11 @@ Adds a freestanding variable to the variable list.
 */
 void Cvar_RegisterVariable (cvar_t *variable)
 {
-	cvar_t *cvar, *cvar2;
+	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
@@ -278,8 +325,8 @@ void Cvar_RegisterVariable (cvar_t *variable)
 	{
 		if (cvar->flags & CVAR_ALLOCATED)
 		{
-			if (developer.integer)
-				Con_Printf("...  replacing existing allocated cvar {\"%s\", \"%s\", %i}", cvar->name, cvar->string, cvar->flags);
+			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)
 			// NOTE: this isn't actually used currently
@@ -287,6 +334,7 @@ void Cvar_RegisterVariable (cvar_t *variable)
 			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...
@@ -299,13 +347,13 @@ void Cvar_RegisterVariable (cvar_t *variable)
 			else
 			{
 				// otherwise find it somewhere in the list
-				for (cvar2 = cvar_vars;cvar2->next != cvar;cvar2 = cvar2->next);
-				if (cvar2->next == cvar)
-					cvar2->next = variable;
+				for (current = cvar_vars;current->next != cvar;current = current->next)
+					;
+				current->next = variable;
 			}
 
 			// get rid of old allocated cvar
-			// (but not the cvar->string, because we kept that)
+			// (but not cvar->string and cvar->defstring, because we kept those)
 			Z_Free(cvar->name);
 			Z_Free(cvar);
 		}
@@ -323,14 +371,28 @@ void Cvar_RegisterVariable (cvar_t *variable)
 
 // copy the value off, because future sets will Z_Free it
 	oldstr = variable->string;
-	variable->string = Z_Malloc (strlen(variable->string)+1);
+	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);
 	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;
+
+	// 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;
 }
 
 /*
@@ -342,17 +404,27 @@ 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;
+	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 = 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 = (char *)Z_Malloc(strlen(value) + 1);
+			strcpy(cvar->defstring, value);
+		}
 		return cvar;
 	}
 
@@ -365,18 +437,33 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags)
 
 // 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->name = Z_Malloc(strlen(name)+1);
+	cvar = (cvar_t *)Z_Malloc(sizeof(cvar_t));
+	cvar->flags = flags | CVAR_ALLOCATED | CVAR_DEFAULTSET;
+	cvar->name = (char *)Z_Malloc(strlen(name)+1);
 	strcpy(cvar->name, name);
-	cvar->string = Z_Malloc(strlen(value)+1);
+	cvar->string = (char *)Z_Malloc(strlen(value)+1);
 	strcpy(cvar->string, value);
+	cvar->defstring = (char *)Z_Malloc(strlen(value)+1);
+	strcpy(cvar->defstring, value);
 	cvar->value = atof (cvar->string);
 	cvar->integer = (int) cvar->value;
+	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;
 }
 
@@ -400,14 +487,12 @@ qboolean	Cvar_Command (void)
 // perform a variable print or set
 	if (Cmd_Argc() == 1)
 	{
-		// only print if host_initialized (otherwise it could print twice if this is in a script)
-		if (host_initialized)
-			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;
 	}
 
-	if (developer.integer)
-		Con_Print("Cvar_Command: ");
+	if (developer.integer >= 100)
+		Con_DPrint("Cvar_Command: ");
 
 	if (v->flags & CVAR_READONLY)
 	{
@@ -415,6 +500,8 @@ qboolean	Cvar_Command (void)
 		return true;
 	}
 	Cvar_Set (v->name, Cmd_Argv(1));
+	if (developer.integer >= 100)
+		Con_DPrint("\n");
 	return true;
 }
 
@@ -433,7 +520,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);
 }
 
 
@@ -448,7 +535,8 @@ void Cvar_List_f (void)
 {
 	cvar_t *cvar;
 	const char *partial;
-	int len, count;
+	size_t len;
+	int count;
 
 	if (Cmd_Argc() > 1)
 	{
@@ -467,14 +555,14 @@ void Cvar_List_f (void)
 		if (partial && strncasecmp (partial,cvar->name,len))
 			continue;
 
-		Con_Printf("%s is \"%s\"\n", cvar->name, cvar->string);
+		Con_Printf("%s is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description);
 		count++;
 	}
 
-	Con_Printf("%i cvar(s)", count);
 	if (partial)
-		Con_Printf(" beginning with \"%s\"", partial);
-	Con_Print("\n");
+		Con_Printf("%i cvar(s) beginning with \"%s\"\n", count, partial);
+	else
+		Con_Printf("%i cvar(s)\n", count);
 }
 // 2000-01-09 CvarList command by Maddes
 
@@ -497,8 +585,7 @@ void Cvar_Set_f (void)
 		return;
 	}
 
-	if (developer.integer)
-		Con_Print("Set: ");
+	Con_DPrint("Set: ");
 
 	// all looks ok, create/modify the cvar
 	Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), 0);
@@ -523,8 +610,7 @@ void Cvar_SetA_f (void)
 		return;
 	}
 
-	if (developer.integer)
-		Con_Print("SetA: ");
+	Con_DPrint("SetA: ");
 
 	// all looks ok, create/modify the cvar
 	Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), CVAR_SAVE);