X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cvar.c;h=8d5af144ee6a2b09c8be09485c9b6d910dff9f62;hp=25ad1421f93ea6526602fec2aa57f14b50d398dd;hb=f575e5ad7f9eab64e89b714e75ff5dd92e49f373;hpb=ff5947f97081e10c4ce112d4d51c2d1fa14ebba8

diff --git a/cvar.c b/cvar.c
index 25ad1421..8d5af144 100644
--- a/cvar.c
+++ b/cvar.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -21,21 +21,81 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-cvar_t	*cvar_vars;
-char	*cvar_null_string = "";
+const char *cvar_dummy_description = "custom cvar";
+
+cvar_t *cvar_vars = NULL;
+cvar_t *cvar_hashtable[CVAR_HASHSIZE];
+const char *cvar_null_string = "";
 
 /*
 ============
 Cvar_FindVar
 ============
 */
-cvar_t *Cvar_FindVar (char *var_name)
+cvar_t *Cvar_FindVar (const char *var_name)
 {
-	cvar_t	*var;
+	int hashindex;
+	cvar_t *var;
+
+	// use hash lookup to minimize search time
+	hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name)) % CVAR_HASHSIZE;
+	for (var = cvar_hashtable[hashindex];var;var = var->nextonhashchain)
+		if (!strcmp (var_name, var->name))
+			return var;
+
+	return NULL;
+}
+
+cvar_t *Cvar_FindVarAfter (const char *prev_var_name, int neededflags)
+{
+	cvar_t *var;
+
+	if (*prev_var_name)
+	{
+		var = Cvar_FindVar (prev_var_name);
+		if (!var)
+			return NULL;
+		var = var->next;
+	}
+	else
+		var = cvar_vars;
+
+	// search for the next cvar matching the needed flags
+	while (var)
+	{
+		if ((var->flags & neededflags) || !neededflags)
+			break;
+		var = var->next;
+	}
+	return var;
+}
+
+cvar_t *Cvar_FindVarLink (const char *var_name, cvar_t **parent, cvar_t ***link, cvar_t **prev_alpha)
+{
+	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));
+	if(parent) *parent = NULL;
+	if(prev_alpha) *prev_alpha = NULL;
+	if(link) *link = &cvar_hashtable[hashindex];
+	for (var = cvar_hashtable[hashindex];var;var = var->nextonhashchain)
+	{
 		if (!strcmp (var_name, var->name))
+		{
+			if(!prev_alpha || var == cvar_vars)
+				return var;
+
+			*prev_alpha = cvar_vars;
+			// if prev_alpha happens to become NULL then there has been some inconsistency elsewhere
+			// already - should I still insert '*prev_alpha &&' in the loop?
+			while((*prev_alpha)->next != var)
+				*prev_alpha = (*prev_alpha)->next;
 			return var;
+		}
+		if(parent) *parent = var;
+	}
 
 	return NULL;
 }
@@ -45,9 +105,9 @@ cvar_t *Cvar_FindVar (char *var_name)
 Cvar_VariableValue
 ============
 */
-float	Cvar_VariableValue (char *var_name)
+float Cvar_VariableValue (const char *var_name)
 {
-	cvar_t	*var;
+	cvar_t *var;
 
 	var = Cvar_FindVar (var_name);
 	if (!var)
@@ -61,7 +121,7 @@ float	Cvar_VariableValue (char *var_name)
 Cvar_VariableString
 ============
 */
-char *Cvar_VariableString (char *var_name)
+const char *Cvar_VariableString (const char *var_name)
 {
 	cvar_t *var;
 
@@ -71,16 +131,46 @@ char *Cvar_VariableString (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;
+}
+
+/*
+============
+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;
+}
+
 
 /*
 ============
 Cvar_CompleteVariable
 ============
 */
-char *Cvar_CompleteVariable (char *partial)
+const char *Cvar_CompleteVariable (const char *partial)
 {
 	cvar_t		*cvar;
-	int			len;
+	size_t		len;
 
 	len = strlen(partial);
 
@@ -89,7 +179,7 @@ char *Cvar_CompleteVariable (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;
@@ -104,11 +194,10 @@ char *Cvar_CompleteVariable (char *partial)
 	Thanks to Fett erich@heintz.com
 
 */
-int
-Cvar_CompleteCountPossible (char *partial)
+int Cvar_CompleteCountPossible (const char *partial)
 {
 	cvar_t	*cvar;
-	int		len;
+	size_t	len;
 	int		h;
 
 	h = 0;
@@ -134,17 +223,16 @@ Cvar_CompleteCountPossible (char *partial)
 	Thanks to taniwha
 
 */
-char	**
-Cvar_CompleteBuildList (char *partial)
+const char **Cvar_CompleteBuildList (const char *partial)
 {
-	cvar_t	*cvar;
-	int		len = 0;
-	int		bpos = 0;
-	int		sizeofbuf = (Cvar_CompleteCountPossible (partial) + 1) * sizeof (char *);
-	char	**buf;
+	const cvar_t *cvar;
+	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 (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))
@@ -154,43 +242,187 @@ Cvar_CompleteBuildList (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 ("^3%s^7 is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description);
+}
+
+// we assume that prog is already set to the target progs
+static void Cvar_UpdateAutoCvar(cvar_t *var)
+{
+	int i;
+	if(!prog)
+		Host_Error("Cvar_UpdateAutoCvar: no prog set");
+	i = PRVM_GetProgNr();
+	if(var->globaldefindex_progid[i] == prog->id)
+	{
+		// MUST BE SYNCED WITH prvm_edict.c PRVM_LoadProgs
+		int j;
+		const char *s;
+		prvm_eval_t *val = (prvm_eval_t *)(prog->globals.generic + prog->globaldefs[var->globaldefindex[i]].ofs);
+		switch(prog->globaldefs[var->globaldefindex[i]].type & ~DEF_SAVEGLOBAL)
+		{
+			case ev_float:
+				val->_float = var->value;
+				break;
+			case ev_vector:
+				s = var->string;
+				VectorClear(val->vector);
+				for (j = 0;j < 3;j++)
+				{
+					while (*s && ISWHITESPACE(*s))
+						s++;
+					if (!*s)
+						break;
+					val->vector[j] = atof(s);
+					while (!ISWHITESPACE(*s))
+						s++;
+					if (!*s)
+						break;
+				}
+				break;
+			case ev_string:
+				PRVM_ChangeEngineString(var->globaldefindex_stringno[i], var->string);
+				val->string = var->globaldefindex_stringno[i];
+				break;
+		}
+	}
+}
+
+// called after loading a savegame
+void Cvar_UpdateAllAutoCvars(void)
+{
+	cvar_t *var;
+	for (var = cvar_vars ; var ; var = var->next)
+		Cvar_UpdateAutoCvar(var);
+}
+
 /*
 ============
 Cvar_Set
 ============
 */
-void Cvar_Set (char *var_name, char *value)
+void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 {
-	cvar_t	*var;
 	qboolean changed;
+	size_t valuelen;
+	prvm_prog_t *tmpprog;
+	int i;
 
-	var = Cvar_FindVar (var_name);
-	if (!var)
-	{	// there is an error in C code if this happens
-		Con_Printf ("Cvar_Set: variable %s not found\n", var_name);
-		return;
-	}
-
-	changed = strcmp(var->string, value);
+	changed = strcmp(var->string, value) != 0;
 	// LordHavoc: don't reallocate when there is no change
 	if (!changed)
 		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
+		Z_Free ((char *)var->string);	// free the old value string
 
-		var->string = Z_Malloc (strlen(value)+1);
+		var->string = (char *)Z_Malloc (valuelen + 1);
 	}
-	strcpy (var->string, value);
+	memcpy ((char *)var->string, value, valuelen + 1);
 	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);
+#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)
-			SV_BroadcastPrintf ("\"%s\" changed to \"%s\"\n", var->name, var->string);
+		{
+			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);
+	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);
+		else if (!strcmp(var->name, "rcon_secure"))
+		{
+			// whenever rcon_secure is changed to 0, clear rcon_password for
+			// security reasons (prevents a send-rcon-password-as-plaintext
+			// attack based on NQ protocol session takeover and svc_stufftext)
+			if(var->integer <= 0)
+				Cvar_Set("rcon_password", "");
+		}
+		else if (!strcmp(var->name, "net_slist_favorites"))
+			NetConn_UpdateFavorites();
+	}
+
+	tmpprog = prog;
+	for(i = 0; i < PRVM_MAXPROGS; ++i)
+	{
+		if(PRVM_ProgLoaded(i))
+		{
+			PRVM_SetProg(i);
+			Cvar_UpdateAutoCvar(var);
+		}
 	}
+	prog = tmpprog;
+}
+
+void Cvar_SetQuick (cvar_t *var, const char *value)
+{
+	if (var == NULL)
+	{
+		Con_Print("Cvar_SetQuick: var == NULL\n");
+		return;
+	}
+
+	if (developer_extra.integer)
+		Con_DPrintf("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)
+{
+	cvar_t *var;
+	var = Cvar_FindVar (var_name);
+	if (var == NULL)
+	{
+		Con_Printf("Cvar_Set: variable %s not found\n", var_name);
+		return;
+	}
+	Cvar_SetQuick(var, value);
 }
 
 /*
@@ -198,13 +430,26 @@ void Cvar_Set (char *var_name, char *value)
 Cvar_SetValue
 ============
 */
-void Cvar_SetValue (char *var_name, float value)
+void Cvar_SetValueQuick(cvar_t *var, float value)
 {
-	char	val[32];
+	char val[MAX_INPUTLINE];
 
-	// LordHavoc: changed from %f to %g to use shortest representation
-	sprintf (val, "%g",value);
-	Cvar_Set (var_name, val);
+	if ((float)((int)value) == value)
+		dpsnprintf(val, sizeof(val), "%i", (int)value);
+	else
+		dpsnprintf(val, sizeof(val), "%f", value);
+	Cvar_SetQuick(var, val);
+}
+
+void Cvar_SetValue(const char *var_name, float value)
+{
+	char val[MAX_INPUTLINE];
+
+	if ((float)((int)value) == value)
+		dpsnprintf(val, sizeof(val), "%i", (int)value);
+	else
+		dpsnprintf(val, sizeof(val), "%f", value);
+	Cvar_Set(var_name, val);
 }
 
 /*
@@ -216,34 +461,188 @@ Adds a freestanding variable to the variable list.
 */
 void Cvar_RegisterVariable (cvar_t *variable)
 {
-	char	*oldstr;
+	int hashindex;
+	cvar_t *current, *next, *cvar;
+	char *oldstr;
+	size_t alloclen;
+
+	if (developer_extra.integer)
+		Con_DPrintf("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_extra.integer)
+				Con_DPrintf("...  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
+			// (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((char *)cvar->name);
+			Z_Free(cvar);
+		}
+		else
+			Con_DPrintf("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;
 	}
 
 // copy the value off, because future sets will Z_Free it
-	oldstr = variable->string;
-	variable->string = Z_Malloc (strlen(variable->string)+1);
-	strcpy (variable->string, oldstr);
+	oldstr = (char *)variable->string;
+	alloclen = strlen(variable->string) + 1;
+	variable->string = (char *)Z_Malloc (alloclen);
+	memcpy ((char *)variable->string, oldstr, alloclen);
+	variable->defstring = (char *)Z_Malloc (alloclen);
+	memcpy ((char *)variable->defstring, oldstr, alloclen);
 	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)) % CVAR_HASHSIZE;
+	variable->nextonhashchain = cvar_hashtable[hashindex];
+	cvar_hashtable[hashindex] = variable;
+}
+
+/*
+============
+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, const char *newdescription)
+{
+	int hashindex;
+	cvar_t *current, *next, *cvar;
+	size_t alloclen;
+
+	if (developer_extra.integer)
+		Con_DPrintf("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);
+		if(newdescription && (cvar->flags & CVAR_ALLOCATED))
+		{
+			if(cvar->description != cvar_dummy_description)
+				Z_Free((char *)cvar->description);
+
+			if(*newdescription)
+			{
+				alloclen = strlen(newdescription) + 1;
+				cvar->description = (char *)Z_Malloc(alloclen);
+				memcpy((char *)cvar->description, newdescription, alloclen);
+			}
+			else
+				cvar->description = cvar_dummy_description;
+		}
+		return cvar;
+	}
+
+// check for pure evil
+	if (!*name)
+	{
+		Con_Printf("Cvar_Get: invalid variable name\n");
+		return NULL;
+	}
+
+// 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
+// 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;
+	alloclen = strlen(name) + 1;
+	cvar->name = (char *)Z_Malloc(alloclen);
+	memcpy((char *)cvar->name, name, alloclen);
+	alloclen = strlen(value) + 1;
+	cvar->string = (char *)Z_Malloc(alloclen);
+	memcpy((char *)cvar->string, value, alloclen);
+	cvar->defstring = (char *)Z_Malloc(alloclen);
+	memcpy((char *)cvar->defstring, value, alloclen);
+	cvar->value = atof (cvar->string);
+	cvar->integer = (int) cvar->value;
+
+	if(newdescription && *newdescription)
+	{
+		alloclen = strlen(newdescription) + 1;
+		cvar->description = (char *)Z_Malloc(alloclen);
+		memcpy((char *)cvar->description, newdescription, alloclen);
+	}
+	else
+		cvar->description = cvar_dummy_description; // actually checked by VM_cvar_type
+
+// link the variable in
+// 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_HASHSIZE;
+	cvar->nextonhashchain = cvar_hashtable[hashindex];
+	cvar_hashtable[hashindex] = cvar;
+
+	return cvar;
 }
 
+
 /*
 ============
 Cvar_Command
@@ -263,15 +662,85 @@ 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->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : v->string), v->defstring);
 		return true;
 	}
 
+	if (developer_extra.integer)
+		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));
+	if (developer_extra.integer)
+		Con_DPrint("\n");
 	return true;
 }
 
 
+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;
+	// 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((char *)var->defstring);
+			alloclen = strlen(var->string) + 1;
+			var->defstring = (char *)Z_Malloc(alloclen);
+			memcpy((char *)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)
+		if((var->flags & CVAR_NORESETTODEFAULTS) == 0)
+			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_NORESETTODEFAULTS | CVAR_SAVE)) == 0)
+			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_NORESETTODEFAULTS | CVAR_SAVE)) == CVAR_SAVE)
+			Cvar_SetQuick(var, var->defstring);
+}
+
+
 /*
 ============
 Cvar_WriteVariables
@@ -280,13 +749,19 @@ Writes lines containing "set variable value" for all variables
 with the archive flag set to true.
 ============
 */
-void Cvar_WriteVariables (QFile *f)
+void Cvar_WriteVariables (qfile_t *f)
 {
 	cvar_t	*var;
+	char buf1[MAX_INPUTLINE], buf2[MAX_INPUTLINE];
 
+	// don't save cvars that match their default value
 	for (var = cvar_vars ; var ; var = var->next)
-		if (var->flags & CVAR_SAVE)
-			Qprintf (f, "%s \"%s\"\n", var->name, var->string);
+		if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || !(var->flags & CVAR_DEFAULTSET)))
+		{
+			Cmd_QuoteString(buf1, sizeof(buf1), var->name, "\"\\$", false);
+			Cmd_QuoteString(buf2, sizeof(buf2), var->string, "\"\\$", false);
+			FS_Printf(f, "%s\"%s\" \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", buf1, buf2);
+		}
 }
 
 
@@ -299,31 +774,186 @@ Cvar_List
 */
 void Cvar_List_f (void)
 {
-	cvar_t	*cvar;
-	char	*partial;
-	int		len;
-	int		count;
+	cvar_t *cvar;
+	const char *partial;
+	size_t len;
+	int count;
+	qboolean ispattern;
 
-	if (Cmd_Argc() > 1) {
+	if (Cmd_Argc() > 1)
+	{
 		partial = Cmd_Argv (1);
 		len = strlen(partial);
-	} else {
+	}
+	else
+	{
 		partial = NULL;
 		len = 0;
 	}
 
+	ispattern = partial && (strchr(partial, '*') || strchr(partial, '?'));
+
 	count = 0;
-	for (cvar = cvar_vars; cvar; cvar = cvar->next) {
-		if (partial && strncmp (partial,cvar->name,len))
+	for (cvar = cvar_vars; cvar; cvar = cvar->next)
+	{
+		if (len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp (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->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring, cvar->description);
 		count++;
 	}
 
-	Con_Printf ("%i cvar(s)", count);
-	if (partial)
-		Con_Printf (" beginning with \"%s\"", partial);
-	Con_Printf ("\n");
+	if (len)
+	{
+		if(ispattern)
+			Con_Printf("%i cvar%s matching \"%s\"\n", count, (count > 1) ? "s" : "", partial);
+		else
+			Con_Printf("%i cvar%s beginning with \"%s\"\n", count, (count > 1) ? "s" : "", partial);
+	}
+	else
+		Con_Printf("%i cvar(s)\n", count);
 }
 // 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> [<description>]\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;
+	}
+
+	if (developer_extra.integer)
+		Con_DPrint("Set: ");
+
+	// all looks ok, create/modify the cvar
+	Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), 0, Cmd_Argc() > 3 ? Cmd_Argv(3) : NULL);
+}
+
+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> [<description>]\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;
+	}
+
+	if (developer_extra.integer)
+		Con_DPrint("SetA: ");
+
+	// all looks ok, create/modify the cvar
+	Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), CVAR_SAVE, Cmd_Argc() > 3 ? Cmd_Argv(3) : NULL);
+}
+
+void Cvar_Del_f (void)
+{
+	int i;
+	cvar_t *cvar, *parent, **link, *prev;
+
+	if(Cmd_Argc() < 2)
+	{
+		Con_Printf("Del: wrong number of parameters, useage: unset <variablename1> [<variablename2> ...]\n");
+		return;
+	}
+	for(i = 1; i < Cmd_Argc(); ++i)
+	{
+		cvar = Cvar_FindVarLink(Cmd_Argv(i), &parent, &link, &prev);
+		if(!cvar)
+		{
+			Con_Printf("Del: %s is not defined\n", Cmd_Argv(i));
+			continue;
+		}
+		if(cvar->flags & CVAR_READONLY)
+		{
+			Con_Printf("Del: %s is read-only\n", cvar->name);
+			continue;
+		}
+		if(!(cvar->flags & CVAR_ALLOCATED))
+		{
+			Con_Printf("Del: %s is static and cannot be deleted\n", cvar->name);
+			continue;
+		}
+		if(cvar == cvar_vars)
+		{
+			cvar_vars = cvar->next;
+		}
+		else
+		{
+			// in this case, prev must be set, otherwise there has been some inconsistensy
+			// elsewhere already... should I still check for prev != NULL?
+			prev->next = cvar->next;
+		}
+
+		if(parent)
+			parent->nextonhashchain = cvar->nextonhashchain;
+		else if(link)
+			*link = cvar->nextonhashchain;
+
+		if(cvar->description != cvar_dummy_description)
+			Z_Free((char *)cvar->description);
+
+		Z_Free((char *)cvar->name);
+		Z_Free((char *)cvar->string);
+		Z_Free((char *)cvar->defstring);
+		Z_Free(cvar);
+	}
+}
+
+#ifdef FILLALLCVARSWITHRUBBISH
+void Cvar_FillAll_f()
+{
+	char *buf, *p, *q;
+	int n, i;
+	cvar_t *var;
+	qboolean verify;
+	if(Cmd_Argc() != 2)
+	{
+		Con_Printf("Usage: %s length to plant rubbish\n", Cmd_Argv(0));
+		Con_Printf("Usage: %s -length to verify that the rubbish is still there\n", Cmd_Argv(0));
+		return;
+	}
+	n = atoi(Cmd_Argv(1));
+	verify = (n < 0);
+	if(verify)
+		n = -n;
+	buf = Z_Malloc(n + 1);
+	buf[n] = 0;
+	for(var = cvar_vars; var; var = var->next)
+	{
+		for(i = 0, p = buf, q = var->name; i < n; ++i)
+		{
+			*p++ = *q++;
+			if(!*q)
+				q = var->name;
+		}
+		if(verify && strcmp(var->string, buf))
+		{
+			Con_Printf("\n%s does not contain the right rubbish, either this is the first run or a possible overrun was detected, or something changed it intentionally; it DOES contain: %s\n", var->name, var->string);
+		}
+		Cvar_SetQuick(var, buf);
+	}
+	Z_Free(buf);
+}
+#endif /* FILLALLCVARSWITHRUBBISH */