X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cvar.c;h=6767ea61418f9893c8d88fac2da357a80ec92489;hb=cd7454f9df6b152a24c5a28750041d27023fbc1f;hp=990ebdb8a082a6bf97c86042d309df83aacc9765;hpb=3d4d9b163a12b9c7b5551d6ab5f4b9c426168213;p=xonotic%2Fdarkplaces.git

diff --git a/cvar.c b/cvar.c
index 990ebdb8..6767ea61 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;
 
@@ -199,7 +203,7 @@ void Cvar_CompleteCvarPrint (const char *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("%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);
 }
 
 
@@ -211,6 +215,7 @@ Cvar_Set
 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
@@ -218,17 +223,33 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 		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)
 		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)
@@ -239,7 +260,7 @@ 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);
@@ -293,10 +314,12 @@ Adds a freestanding variable to the variable list.
 */
 void Cvar_RegisterVariable (cvar_t *variable)
 {
+	int hashindex;
 	cvar_t *current, *next, *cvar;
 	char *oldstr;
+	size_t alloclen;
 
-	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
@@ -305,7 +328,7 @@ void Cvar_RegisterVariable (cvar_t *variable)
 	{
 		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)
@@ -351,10 +374,11 @@ void Cvar_RegisterVariable (cvar_t *variable)
 
 // 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;
 
@@ -368,6 +392,11 @@ void Cvar_RegisterVariable (cvar_t *variable)
 		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;
 }
 
 /*
@@ -379,9 +408,11 @@ 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;
+	size_t alloclen;
 
-	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
@@ -390,15 +421,6 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags)
 	{
 		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;
 	}
 
@@ -410,22 +432,37 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags)
 	}
 
 // 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_DEFAULTSET;
-	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);
+	cvar->flags = flags | CVAR_ALLOCATED;
+	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";
 
 // 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;
 }
 
@@ -453,7 +490,8 @@ qboolean	Cvar_Command (void)
 		return true;
 	}
 
-	Con_DPrint("Cvar_Command: ");
+	if (developer.integer >= 100)
+		Con_DPrint("Cvar_Command: ");
 
 	if (v->flags & CVAR_READONLY)
 	{
@@ -461,10 +499,62 @@ qboolean	Cvar_Command (void)
 		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))
+		{
+			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);
+			alloclen = strlen(var->string) + 1;
+			var->defstring = (char *)Z_Malloc(alloclen);
+			memcpy(var->defstring, var->string, alloclen);
+		}
+	}
+}
+
+
+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
@@ -477,8 +567,9 @@ void Cvar_WriteVariables (qfile_t *f)
 {
 	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);
 }