X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cvar.c;h=be6ed386f08405660bdf053b7884830703a965fe;hb=9e9074d0ea349fb16cfdd492df66b8683a62f4b7;hp=c6f69360825f07765f71b485561f40370f17ae09;hpb=3f4d89c11594f247887a62a78877a36f85fdd2ee;p=xonotic%2Fdarkplaces.git

diff --git a/cvar.c b/cvar.c
index c6f69360..be6ed386 100644
--- a/cvar.c
+++ b/cvar.c
@@ -21,56 +21,56 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-char *cvar_dummy_description = "custom cvar";
+const char *cvar_dummy_description = "custom cvar";
+static const char *cvar_null_string = "";
 
-cvar_t *cvar_vars = NULL;
-cvar_t *cvar_hashtable[CVAR_HASHSIZE];
-char *cvar_null_string = "";
+cvar_state_t cvars_all;
+cvar_state_t cvars_null;
 
 /*
 ============
 Cvar_FindVar
 ============
 */
-cvar_t *Cvar_FindVar (const char *var_name)
+cvar_t *Cvar_FindVar(cvar_state_t *cvars, const char *var_name, int neededflags)
 {
 	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))
+	for (var = cvars->hashtable[hashindex];var;var = var->nextonhashchain)
+		if (!strcmp (var_name, var->name) && (var->flags & neededflags))
 			return var;
 
 	return NULL;
 }
 
-cvar_t *Cvar_FindVarAfter (const char *prev_var_name, int neededflags)
+cvar_t *Cvar_FindVarAfter(cvar_state_t *cvars, const char *prev_var_name, int neededflags)
 {
 	cvar_t *var;
 
 	if (*prev_var_name)
 	{
-		var = Cvar_FindVar (prev_var_name);
+		var = Cvar_FindVar(cvars, prev_var_name, neededflags);
 		if (!var)
 			return NULL;
 		var = var->next;
 	}
 	else
-		var = cvar_vars;
+		var = cvars->vars;
 
 	// search for the next cvar matching the needed flags
 	while (var)
 	{
-		if ((var->flags & neededflags) || !neededflags)
+		if (var->flags & 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)
+static cvar_t *Cvar_FindVarLink(cvar_state_t *cvars, const char *var_name, cvar_t **parent, cvar_t ***link, cvar_t **prev_alpha, int neededflags)
 {
 	int hashindex;
 	cvar_t *var;
@@ -79,15 +79,15 @@ cvar_t *Cvar_FindVarLink (const char *var_name, cvar_t **parent, cvar_t ***link,
 	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(link) *link = &cvars->hashtable[hashindex];
+	for (var = cvars->hashtable[hashindex];var;var = var->nextonhashchain)
 	{
-		if (!strcmp (var_name, var->name))
+		if (!strcmp (var_name, var->name) && (var->flags & neededflags))
 		{
-			if(!prev_alpha || var == cvar_vars)
+			if(!prev_alpha || var == cvars->vars)
 				return var;
 
-			*prev_alpha = cvar_vars;
+			*prev_alpha = cvars->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)
@@ -105,42 +105,51 @@ cvar_t *Cvar_FindVarLink (const char *var_name, cvar_t **parent, cvar_t ***link,
 Cvar_VariableValue
 ============
 */
-float Cvar_VariableValue (const char *var_name)
+float Cvar_VariableValueOr(cvar_state_t *cvars, const char *var_name, float def, int neededflags)
 {
 	cvar_t *var;
 
-	var = Cvar_FindVar (var_name);
+	var = Cvar_FindVar(cvars, var_name, neededflags);
 	if (!var)
-		return 0;
+		return def;
 	return atof (var->string);
 }
 
+float Cvar_VariableValue(cvar_state_t *cvars, const char *var_name, int neededflags)
+{
+	return Cvar_VariableValueOr(cvars, var_name, 0, neededflags);
+}
 
 /*
 ============
 Cvar_VariableString
 ============
 */
-const char *Cvar_VariableString (const char *var_name)
+const char *Cvar_VariableStringOr(cvar_state_t *cvars, const char *var_name, const char *def, int neededflags)
 {
 	cvar_t *var;
 
-	var = Cvar_FindVar (var_name);
+	var = Cvar_FindVar(cvars, var_name, neededflags);
 	if (!var)
-		return cvar_null_string;
+		return def;
 	return var->string;
 }
 
+const char *Cvar_VariableString(cvar_state_t *cvars, const char *var_name, int neededflags)
+{
+	return Cvar_VariableStringOr(cvars, var_name, cvar_null_string, neededflags);
+}
+
 /*
 ============
 Cvar_VariableDefString
 ============
 */
-const char *Cvar_VariableDefString (const char *var_name)
+const char *Cvar_VariableDefString(cvar_state_t *cvars, const char *var_name, int neededflags)
 {
 	cvar_t *var;
 
-	var = Cvar_FindVar (var_name);
+	var = Cvar_FindVar(cvars, var_name, neededflags);
 	if (!var)
 		return cvar_null_string;
 	return var->defstring;
@@ -151,11 +160,11 @@ const char *Cvar_VariableDefString (const char *var_name)
 Cvar_VariableDescription
 ============
 */
-const char *Cvar_VariableDescription (const char *var_name)
+const char *Cvar_VariableDescription(cvar_state_t *cvars, const char *var_name, int neededflags)
 {
 	cvar_t *var;
 
-	var = Cvar_FindVar (var_name);
+	var = Cvar_FindVar(cvars, var_name, neededflags);
 	if (!var)
 		return cvar_null_string;
 	return var->description;
@@ -167,7 +176,7 @@ const char *Cvar_VariableDescription (const char *var_name)
 Cvar_CompleteVariable
 ============
 */
-const char *Cvar_CompleteVariable (const char *partial)
+const char *Cvar_CompleteVariable(cvar_state_t *cvars, const char *partial, int neededflags)
 {
 	cvar_t		*cvar;
 	size_t		len;
@@ -178,8 +187,8 @@ const char *Cvar_CompleteVariable (const char *partial)
 		return NULL;
 
 // check functions
-	for (cvar=cvar_vars ; cvar ; cvar=cvar->next)
-		if (!strncasecmp (partial,cvar->name, len))
+	for (cvar=cvars->vars ; cvar ; cvar=cvar->next)
+		if (!strncasecmp (partial,cvar->name, len) && (cvar->flags & neededflags))
 			return cvar->name;
 
 	return NULL;
@@ -194,7 +203,7 @@ const char *Cvar_CompleteVariable (const char *partial)
 	Thanks to Fett erich@heintz.com
 
 */
-int Cvar_CompleteCountPossible (const char *partial)
+int Cvar_CompleteCountPossible(cvar_state_t *cvars, const char *partial, int neededflags)
 {
 	cvar_t	*cvar;
 	size_t	len;
@@ -207,8 +216,8 @@ int Cvar_CompleteCountPossible (const char *partial)
 		return	0;
 
 	// Loop through the cvars and count all possible matches
-	for (cvar = cvar_vars; cvar; cvar = cvar->next)
-		if (!strncasecmp(partial, cvar->name, len))
+	for (cvar = cvars->vars; cvar; cvar = cvar->next)
+		if (!strncasecmp(partial, cvar->name, len) && (cvar->flags & neededflags))
 			h++;
 
 	return h;
@@ -223,83 +232,108 @@ int Cvar_CompleteCountPossible (const char *partial)
 	Thanks to taniwha
 
 */
-const char **Cvar_CompleteBuildList (const char *partial)
+const char **Cvar_CompleteBuildList(cvar_state_t *cvars, const char *partial, int neededflags)
 {
 	const cvar_t *cvar;
 	size_t len = 0;
 	size_t bpos = 0;
-	size_t sizeofbuf = (Cvar_CompleteCountPossible (partial) + 1) * sizeof (const char *);
+	size_t sizeofbuf = (Cvar_CompleteCountPossible(cvars, partial, neededflags) + 1) * sizeof(const char *);
 	const char **buf;
 
 	len = strlen(partial);
-	buf = (const char **)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))
+	for (cvar = cvars->vars; cvar; cvar = cvar->next)
+		if (!strncasecmp(partial, cvar->name, len) && (cvar->flags & neededflags))
 			buf[bpos++] = cvar->name;
 
 	buf[bpos] = NULL;
 	return buf;
 }
 
-// written by LordHavoc
-void Cvar_CompleteCvarPrint (const char *partial)
+void Cvar_PrintHelp(cvar_t *cvar, qboolean full)
+{
+	Con_Printf("^3%s^7 is \"%s\" [\"%s\"] ", cvar->name, ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring);
+	if (full)
+		Con_Printf("%s", cvar->description);
+	Con_Printf("\n");
+}
+
+// written by LadyHavoc
+void Cvar_CompleteCvarPrint(cvar_state_t *cvars, const char *partial, int neededflags)
 {
 	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);
+	for (cvar = cvars->vars; cvar; cvar = cvar->next)
+		if (!strncasecmp(partial, cvar->name, len) && (cvar->flags & neededflags))
+			Cvar_PrintHelp(cvar, true);
+}
+
+// check if a cvar is held by some progs
+static qboolean Cvar_IsAutoCvar(cvar_t *var)
+{
+	int i;
+	prvm_prog_t *prog;
+	for (i = 0;i < PRVM_PROG_MAX;i++)
+	{
+		prog = &prvm_prog_list[i];
+		if (prog->loaded && var->globaldefindex[i] >= 0)
+			return true;
+	}
+	return false;
 }
 
 // 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)
+	int j;
+	const char *s;
+	vec3_t v;
+	prvm_prog_t *prog;
+	for (i = 0;i < PRVM_PROG_MAX;i++)
+	{
+		prog = &prvm_prog_list[i];
+		if (prog->loaded && var->globaldefindex[i] >= 0)
 		{
+			// MUST BE SYNCED WITH prvm_edict.c PRVM_LoadProgs
+			switch(prog->globaldefs[var->globaldefindex[i]].type & ~DEF_SAVEGLOBAL)
+			{
 			case ev_float:
-				val->_float = var->value;
+				PRVM_GLOBALFIELDFLOAT(prog->globaldefs[var->globaldefindex[i]].ofs) = var->value;
 				break;
 			case ev_vector:
 				s = var->string;
-				VectorClear(val->vector);
+				VectorClear(v);
 				for (j = 0;j < 3;j++)
 				{
 					while (*s && ISWHITESPACE(*s))
 						s++;
 					if (!*s)
 						break;
-					val->vector[j] = atof(s);
+					v[j] = atof(s);
 					while (!ISWHITESPACE(*s))
 						s++;
 					if (!*s)
 						break;
 				}
+				VectorCopy(v, PRVM_GLOBALFIELDVECTOR(prog->globaldefs[var->globaldefindex[i]].ofs));
 				break;
 			case ev_string:
-				PRVM_ChangeEngineString(var->globaldefindex_stringno[i], var->string);
-				val->string = var->globaldefindex_stringno[i];
+				PRVM_ChangeEngineString(prog, var->globaldefindex_stringno[i], var->string);
+				PRVM_GLOBALFIELDSTRING(prog->globaldefs[var->globaldefindex[i]].ofs) = var->globaldefindex_stringno[i];
 				break;
+			}
 		}
 	}
 }
 
 // called after loading a savegame
-void Cvar_UpdateAllAutoCvars(void)
+void Cvar_UpdateAllAutoCvars(cvar_state_t *cvars)
 {
 	cvar_t *var;
-	for (var = cvar_vars ; var ; var = var->next)
+	for (var = cvars->vars ; var ; var = var->next)
 		Cvar_UpdateAutoCvar(var);
 }
 
@@ -308,31 +342,39 @@ void Cvar_UpdateAllAutoCvars(void)
 Cvar_Set
 ============
 */
-void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
+extern cvar_t sv_disablenotify;
+static void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 {
+	cvar_state_t *cvars = &cvars_all;
 	qboolean changed;
 	size_t valuelen;
-	prvm_prog_t *tmpprog;
-	int i;
+	char vabuf[1024];
+	char new_value[MAX_INPUTLINE];
 
 	changed = strcmp(var->string, value) != 0;
-	// LordHavoc: don't reallocate when there is no change
+	// LadyHavoc: don't reallocate when there is no change
 	if (!changed)
 		return;
 
-	// LordHavoc: don't reallocate when the buffer is the same size
-	valuelen = strlen(value);
+	memcpy(new_value,value,MAX_INPUTLINE);
+	
+	// Call the function stored in the cvar for bounds checking, cleanup, etc
+	if (var->callback)
+		var->callback(new_value);
+
+	// LadyHavoc: don't reallocate when the buffer is the same size
+	valuelen = strlen(new_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 = (char *)Z_Malloc (valuelen + 1);
 	}
-	memcpy (var->string, value, valuelen + 1);
+	memcpy ((char *)var->string, new_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 ((var->flags & CVAR_NOTIFY) && changed && sv.active && !sv_disablenotify.integer)
+		SV_BroadcastPrintf("\001^3Server cvar \"%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)
@@ -359,16 +401,18 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 		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);
+			CL_SetInfo("topcolor", va(vabuf, sizeof(vabuf), "%i", top), true, false, false, false);
+			CL_SetInfo("bottomcolor", va(vabuf, sizeof(vabuf), "%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));
+				MSG_WriteString(&cls.netcon->message, va(vabuf, sizeof(vabuf), "color %i %i", top, bottom));
 			}
 		}
 		else if (!strcmp(var->name, "_cl_rate"))
-			CL_SetInfo("rate", va("%i", var->integer), true, false, false, false);
+			CL_SetInfo("rate", va(vabuf, sizeof(vabuf), "%i", var->integer), true, false, false, false);
+		else if (!strcmp(var->name, "_cl_rate_burstsize"))
+			CL_SetInfo("rate_burstsize", va(vabuf, sizeof(vabuf), "%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"))
@@ -381,22 +425,15 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 			// 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", "");
+				Cvar_Set(cvars, "rcon_password", "");
 		}
+#ifdef CONFIG_MENU
 		else if (!strcmp(var->name, "net_slist_favorites"))
 			NetConn_UpdateFavorites();
+#endif
 	}
 
-	tmpprog = prog;
-	for(i = 0; i < PRVM_MAXPROGS; ++i)
-	{
-		if(PRVM_ProgLoaded(i))
-		{
-			PRVM_SetProg(i);
-			Cvar_UpdateAutoCvar(var);
-		}
-	}
-	prog = tmpprog;
+	Cvar_UpdateAutoCvar(var);
 }
 
 void Cvar_SetQuick (cvar_t *var, const char *value)
@@ -413,10 +450,10 @@ void Cvar_SetQuick (cvar_t *var, const char *value)
 	Cvar_SetQuick_Internal(var, value);
 }
 
-void Cvar_Set (const char *var_name, const char *value)
+void Cvar_Set(cvar_state_t *cvars, const char *var_name, const char *value)
 {
 	cvar_t *var;
-	var = Cvar_FindVar (var_name);
+	var = Cvar_FindVar(cvars, var_name, ~0);
 	if (var == NULL)
 	{
 		Con_Printf("Cvar_Set: variable %s not found\n", var_name);
@@ -441,7 +478,7 @@ void Cvar_SetValueQuick(cvar_t *var, float value)
 	Cvar_SetQuick(var, val);
 }
 
-void Cvar_SetValue(const char *var_name, float value)
+void Cvar_SetValue(cvar_state_t *cvars, const char *var_name, float value)
 {
 	char val[MAX_INPUTLINE];
 
@@ -449,7 +486,12 @@ void Cvar_SetValue(const char *var_name, float value)
 		dpsnprintf(val, sizeof(val), "%i", (int)value);
 	else
 		dpsnprintf(val, sizeof(val), "%f", value);
-	Cvar_Set(var_name, val);
+	Cvar_Set(cvars, var_name, val);
+}
+
+void Cvar_RegisterCallback(cvar_t *variable, void (*callback)(char *))
+{
+	variable->callback = callback;
 }
 
 /*
@@ -461,16 +503,33 @@ Adds a freestanding variable to the variable list.
 */
 void Cvar_RegisterVariable (cvar_t *variable)
 {
+	cvar_state_t *cvars = NULL;
 	int hashindex;
 	cvar_t *current, *next, *cvar;
 	char *oldstr;
 	size_t alloclen;
+	int i;
+
+	switch (variable->flags & (CVAR_CLIENT | CVAR_SERVER))
+	{
+	case CVAR_CLIENT:
+	case CVAR_SERVER:
+	case CVAR_CLIENT | CVAR_SERVER:
+		cvars = &cvars_all;
+		break;
+	case 0:
+		Sys_Error("Cvar_RegisterVariable({\"%s\", \"%s\", %i}) with no CVAR_CLIENT | CVAR_SERVER flags\n", variable->name, variable->string, variable->flags);
+		break;
+	default:
+		Sys_Error("Cvar_RegisterVariable({\"%s\", \"%s\", %i}) with weird CVAR_CLIENT | CVAR_SERVER flags\n", variable->name, variable->string, variable->flags);
+		break;
+	}
 
 	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
-	cvar = Cvar_FindVar (variable->name);
+	cvar = Cvar_FindVar(cvars, variable->name, ~0);
 	if (cvar)
 	{
 		if (cvar->flags & CVAR_ALLOCATED)
@@ -487,24 +546,27 @@ void Cvar_RegisterVariable (cvar_t *variable)
 			variable->defstring = cvar->defstring;
 			variable->value = atof (variable->string);
 			variable->integer = (int) variable->value;
+			// Preserve autocvar status.
+			memcpy(variable->globaldefindex, cvar->globaldefindex, sizeof(variable->globaldefindex));
+			memcpy(variable->globaldefindex_stringno, cvar->globaldefindex_stringno, sizeof(variable->globaldefindex_stringno));
 			// replace cvar with this one...
 			variable->next = cvar->next;
-			if (cvar_vars == cvar)
+			if (cvars->vars == cvar)
 			{
 				// head of the list is easy to change
-				cvar_vars = variable;
+				cvars->vars = variable;
 			}
 			else
 			{
 				// otherwise find it somewhere in the list
-				for (current = cvar_vars;current->next != cvar;current = current->next)
+				for (current = cvars->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((char *)cvar->name);
 			Z_Free(cvar);
 		}
 		else
@@ -513,37 +575,41 @@ void Cvar_RegisterVariable (cvar_t *variable)
 	}
 
 // check for overlap with a command
-	if (Cmd_Exists (variable->name))
+	if (Cmd_Exists(&cmd_client, variable->name) || Cmd_Exists(&cmd_server, 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;
+	oldstr = (char *)variable->string;
 	alloclen = strlen(variable->string) + 1;
 	variable->string = (char *)Z_Malloc (alloclen);
-	memcpy (variable->string, oldstr, alloclen);
+	memcpy ((char *)variable->string, oldstr, alloclen);
 	variable->defstring = (char *)Z_Malloc (alloclen);
-	memcpy (variable->defstring, oldstr, alloclen);
+	memcpy ((char *)variable->defstring, oldstr, alloclen);
 	variable->value = atof (variable->string);
 	variable->integer = (int) variable->value;
 
+	// Mark it as not an autocvar.
+	for (i = 0;i < PRVM_PROG_MAX;i++)
+		variable->globaldefindex[i] = -1;
+
 // link the variable in
 // alphanumerical order
-	for( current = NULL, next = cvar_vars ; next && strcmp( next->name, variable->name ) < 0 ; current = next, next = next->next )
+	for( current = NULL, next = cvars->vars ; next && strcmp( next->name, variable->name ) < 0 ; current = next, next = next->next )
 		;
 	if( current ) {
 		current->next = variable;
 	} else {
-		cvar_vars = variable;
+		cvars->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;
+	variable->nextonhashchain = cvars->hashtable[hashindex];
+	cvars->hashtable[hashindex] = variable;
 }
 
 /*
@@ -553,17 +619,17 @@ 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)
+cvar_t *Cvar_Get(cvar_state_t *cvars, const char *name, const char *value, int flags, const char *newdescription)
 {
 	int hashindex;
 	cvar_t *current, *next, *cvar;
-	size_t alloclen;
+	int i;
 
 	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);
+	cvar = Cvar_FindVar(cvars, name, ~0);
 	if (cvar)
 	{
 		cvar->flags |= flags;
@@ -571,14 +637,10 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne
 		if(newdescription && (cvar->flags & CVAR_ALLOCATED))
 		{
 			if(cvar->description != cvar_dummy_description)
-				Z_Free(cvar->description);
+				Z_Free((char *)cvar->description);
 
 			if(*newdescription)
-			{
-				alloclen = strlen(newdescription) + 1;
-				cvar->description = (char *)Z_Malloc(alloclen);
-				memcpy(cvar->description, newdescription, alloclen);
-			}
+				cvar->description = (char *)Mem_strdup(zonemempool, newdescription);
 			else
 				cvar->description = cvar_dummy_description;
 		}
@@ -593,7 +655,7 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne
 	}
 
 // check for overlap with a command
-	if (Cmd_Exists (name))
+	if (Cmd_Exists(&cmd_client, name) || Cmd_Exists(&cmd_server, name))
 	{
 		Con_Printf("Cvar_Get: %s is a command\n", name);
 		return NULL;
@@ -604,40 +666,35 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne
 // 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(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->name = (char *)Mem_strdup(zonemempool, name);
+	cvar->string = (char *)Mem_strdup(zonemempool, value);
+	cvar->defstring = (char *)Mem_strdup(zonemempool, value);
 	cvar->value = atof (cvar->string);
 	cvar->integer = (int) cvar->value;
 
 	if(newdescription && *newdescription)
-	{
-		alloclen = strlen(newdescription) + 1;
-		cvar->description = (char *)Z_Malloc(alloclen);
-		memcpy(cvar->description, newdescription, alloclen);
-	}
+		cvar->description = (char *)Mem_strdup(zonemempool, newdescription);
 	else
 		cvar->description = cvar_dummy_description; // actually checked by VM_cvar_type
 
+	// Mark it as not an autocvar.
+	for (i = 0;i < PRVM_PROG_MAX;i++)
+		cvar->globaldefindex[i] = -1;
+
 // link the variable in
 // alphanumerical order
-	for( current = NULL, next = cvar_vars ; next && strcmp( next->name, cvar->name ) < 0 ; current = next, next = next->next )
+	for( current = NULL, next = cvars->vars ; next && strcmp( next->name, cvar->name ) < 0 ; current = next, next = next->next )
 		;
 	if( current )
 		current->next = cvar;
 	else
-		cvar_vars = cvar;
+		cvars->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;
+	cvar->nextonhashchain = cvars->hashtable[hashindex];
+	cvars->hashtable[hashindex] = cvar;
 
 	return cvar;
 }
@@ -650,19 +707,20 @@ Cvar_Command
 Handles variable inspection and changing from the console
 ============
 */
-qboolean	Cvar_Command (void)
+qboolean	Cvar_Command (cmd_state_t *cmd)
 {
+	cvar_state_t	*cvars = cmd->cvars;
 	cvar_t			*v;
 
 // check variables
-	v = Cvar_FindVar (Cmd_Argv(0));
+	v = Cvar_FindVar(cvars, Cmd_Argv(cmd, 0), cmd->cvars_flagsmask);
 	if (!v)
 		return false;
 
 // perform a variable print or set
-	if (Cmd_Argc() == 1)
+	if (Cmd_Argc(cmd) == 1)
 	{
-		Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, ((v->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : v->string), v->defstring);
+		Cvar_PrintHelp(v, true);
 		return true;
 	}
 
@@ -674,27 +732,29 @@ qboolean	Cvar_Command (void)
 		Con_Printf("%s is read-only\n", v->name);
 		return true;
 	}
-	Cvar_Set (v->name, Cmd_Argv(1));
+	Cvar_SetQuick(v, Cmd_Argv(cmd, 1));
 	if (developer_extra.integer)
 		Con_DPrint("\n");
 	return true;
 }
 
 
-void Cvar_UnlockDefaults (void)
+void Cvar_UnlockDefaults(cmd_state_t *cmd)
 {
+	cvar_state_t *cvars = cmd->cvars;
 	cvar_t *var;
 	// unlock the default values of all cvars
-	for (var = cvar_vars ; var ; var = var->next)
+	for (var = cvars->vars ; var ; var = var->next)
 		var->flags &= ~CVAR_DEFAULTSET;
 }
 
 
-void Cvar_LockDefaults_f (void)
+void Cvar_LockDefaults_f(cmd_state_t *cmd)
 {
+	cvar_state_t *cvars = cmd->cvars;
 	cvar_t *var;
 	// lock in the default values of all cvars
-	for (var = cvar_vars ; var ; var = var->next)
+	for (var = cvars->vars ; var ; var = var->next)
 	{
 		if (!(var->flags & CVAR_DEFAULTSET))
 		{
@@ -702,40 +762,134 @@ void Cvar_LockDefaults_f (void)
 
 			//Con_Printf("locking cvar %s (%s -> %s)\n", var->name, var->string, var->defstring);
 			var->flags |= CVAR_DEFAULTSET;
-			Z_Free(var->defstring);
+			Z_Free((char *)var->defstring);
 			alloclen = strlen(var->string) + 1;
 			var->defstring = (char *)Z_Malloc(alloclen);
-			memcpy(var->defstring, var->string, alloclen);
+			memcpy((char *)var->defstring, var->string, alloclen);
 		}
 	}
 }
 
+void Cvar_SaveInitState(cvar_state_t *cvars)
+{
+	cvar_t *c;
+	for (c = cvars->vars;c;c = c->next)
+	{
+		c->initstate = true;
+		c->initflags = c->flags;
+		c->initdefstring = Mem_strdup(zonemempool, c->defstring);
+		c->initstring = Mem_strdup(zonemempool, c->string);
+		c->initvalue = c->value;
+		c->initinteger = c->integer;
+		VectorCopy(c->vector, c->initvector);
+	}
+}
 
-void Cvar_ResetToDefaults_All_f (void)
+void Cvar_RestoreInitState(cvar_state_t *cvars)
 {
+	int hashindex;
+	cvar_t *c, **cp;
+	cvar_t *c2, **cp2;
+	for (cp = &cvars->vars;(c = *cp);)
+	{
+		if (c->initstate)
+		{
+			// restore this cvar, it existed at init
+			if (((c->flags ^ c->initflags) & CVAR_MAXFLAGSVAL)
+			 || strcmp(c->defstring ? c->defstring : "", c->initdefstring ? c->initdefstring : "")
+			 || strcmp(c->string ? c->string : "", c->initstring ? c->initstring : ""))
+			{
+				Con_DPrintf("Cvar_RestoreInitState: Restoring cvar \"%s\"\n", c->name);
+				if (c->defstring)
+					Z_Free((char *)c->defstring);
+				c->defstring = Mem_strdup(zonemempool, c->initdefstring);
+				if (c->string)
+					Z_Free((char *)c->string);
+				c->string = Mem_strdup(zonemempool, c->initstring);
+			}
+			c->flags = c->initflags;
+			c->value = c->initvalue;
+			c->integer = c->initinteger;
+			VectorCopy(c->initvector, c->vector);
+			cp = &c->next;
+		}
+		else
+		{
+			if (!(c->flags & CVAR_ALLOCATED))
+			{
+				Con_DPrintf("Cvar_RestoreInitState: Unable to destroy cvar \"%s\", it was registered after init!\n", c->name);
+				// In this case, at least reset it to the default.
+				if((c->flags & CVAR_NORESETTODEFAULTS) == 0)
+					Cvar_SetQuick(c, c->defstring);
+				cp = &c->next;
+				continue;
+			}
+			if (Cvar_IsAutoCvar(c))
+			{
+				Con_DPrintf("Cvar_RestoreInitState: Unable to destroy cvar \"%s\", it is an autocvar used by running progs!\n", c->name);
+				// In this case, at least reset it to the default.
+				if((c->flags & CVAR_NORESETTODEFAULTS) == 0)
+					Cvar_SetQuick(c, c->defstring);
+				cp = &c->next;
+				continue;
+			}
+			// remove this cvar, it did not exist at init
+			Con_DPrintf("Cvar_RestoreInitState: Destroying cvar \"%s\"\n", c->name);
+			// unlink struct from hash
+			hashindex = CRC_Block((const unsigned char *)c->name, strlen(c->name)) % CVAR_HASHSIZE;
+			for (cp2 = &cvars->hashtable[hashindex];(c2 = *cp2);)
+			{
+				if (c2 == c)
+				{
+					*cp2 = c2->nextonhashchain;
+					break;
+				}
+				else
+					cp2 = &c2->nextonhashchain;
+			}
+			// unlink struct from main list
+			*cp = c->next;
+			// free strings
+			if (c->defstring)
+				Z_Free((char *)c->defstring);
+			if (c->string)
+				Z_Free((char *)c->string);
+			if (c->description && c->description != cvar_dummy_description)
+				Z_Free((char *)c->description);
+			// free struct
+			Z_Free(c);
+		}
+	}
+}
+
+void Cvar_ResetToDefaults_All_f(cmd_state_t *cmd)
+{
+	cvar_state_t *cvars = cmd->cvars;
 	cvar_t *var;
 	// restore the default values of all cvars
-	for (var = cvar_vars ; var ; var = var->next)
+	for (var = cvars->vars ; var ; var = var->next)
 		if((var->flags & CVAR_NORESETTODEFAULTS) == 0)
 			Cvar_SetQuick(var, var->defstring);
 }
 
 
-void Cvar_ResetToDefaults_NoSaveOnly_f (void)
+void Cvar_ResetToDefaults_NoSaveOnly_f(cmd_state_t *cmd)
 {
+	cvar_state_t *cvars = cmd->cvars;
 	cvar_t *var;
 	// restore the default values of all cvars
-	for (var = cvar_vars ; var ; var = var->next)
+	for (var = cvars->vars ; var ; var = var->next)
 		if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == 0)
 			Cvar_SetQuick(var, var->defstring);
 }
 
 
-void Cvar_ResetToDefaults_SaveOnly_f (void)
+void Cvar_ResetToDefaults_SaveOnly_f(cmd_state_t *cmd)
 {
+	cvar_state_t *cvars = cmd->cvars;
 	cvar_t *var;
 	// restore the default values of all cvars
-	for (var = cvar_vars ; var ; var = var->next)
+	for (var = cvars->vars ; var ; var = var->next)
 		if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == CVAR_SAVE)
 			Cvar_SetQuick(var, var->defstring);
 }
@@ -749,17 +903,17 @@ Writes lines containing "set variable value" for all variables
 with the archive flag set to true.
 ============
 */
-void Cvar_WriteVariables (qfile_t *f)
+void Cvar_WriteVariables (cvar_state_t *cvars, 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) && (strcmp(var->string, var->defstring) || (var->flags & CVAR_ALLOCATED)))
+	for (var = cvars->vars ; var ; var = var->next)
+		if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || ((var->flags & CVAR_ALLOCATED) && !(var->flags & CVAR_DEFAULTSET))))
 		{
-			Cmd_QuoteString(buf1, sizeof(buf1), var->name, "\"\\$");
-			Cmd_QuoteString(buf2, sizeof(buf2), var->string, "\"\\$");
+			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);
 		}
 }
@@ -772,34 +926,35 @@ void Cvar_WriteVariables (qfile_t *f)
 Cvar_List
 =========
 */
-void Cvar_List_f (void)
+void Cvar_List_f(cmd_state_t *cmd)
 {
+	cvar_state_t *cvars = cmd->cvars;
 	cvar_t *cvar;
 	const char *partial;
 	size_t len;
 	int count;
 	qboolean ispattern;
 
-	if (Cmd_Argc() > 1)
+	if (Cmd_Argc(cmd) > 1)
 	{
-		partial = Cmd_Argv (1);
+		partial = Cmd_Argv(cmd, 1);
 		len = strlen(partial);
+		ispattern = (strchr(partial, '*') || strchr(partial, '?'));
 	}
 	else
 	{
 		partial = NULL;
 		len = 0;
+		ispattern = false;
 	}
 
-	ispattern = partial && (strchr(partial, '*') || strchr(partial, '?'));
-
 	count = 0;
-	for (cvar = cvar_vars; cvar; cvar = cvar->next)
+	for (cvar = cvars->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\" [\"%s\"] %s\n", cvar->name, ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring, cvar->description);
+		Cvar_PrintHelp(cvar, true);
 		count++;
 	}
 
@@ -815,19 +970,20 @@ void Cvar_List_f (void)
 }
 // 2000-01-09 CvarList command by Maddes
 
-void Cvar_Set_f (void)
+void Cvar_Set_f(cmd_state_t *cmd)
 {
+	cvar_state_t *cvars = cmd->cvars;
 	cvar_t *cvar;
 
 	// make sure it's the right number of parameters
-	if (Cmd_Argc() < 3)
+	if (Cmd_Argc(cmd) < 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));
+	cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0);
 	if (cvar && cvar->flags & CVAR_READONLY)
 	{
 		Con_Printf("Set: %s is read-only\n", cvar->name);
@@ -838,22 +994,23 @@ void Cvar_Set_f (void)
 		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);
+	Cvar_Get(cvars, Cmd_Argv(cmd, 1), Cmd_Argv(cmd, 2), cmd->cvars_flagsmask, Cmd_Argc(cmd) > 3 ? Cmd_Argv(cmd, 3) : NULL);
 }
 
-void Cvar_SetA_f (void)
+void Cvar_SetA_f(cmd_state_t *cmd)
 {
+	cvar_state_t *cvars = cmd->cvars;
 	cvar_t *cvar;
 
 	// make sure it's the right number of parameters
-	if (Cmd_Argc() < 3)
+	if (Cmd_Argc(cmd) < 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));
+	cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0);
 	if (cvar && cvar->flags & CVAR_READONLY)
 	{
 		Con_Printf("SetA: %s is read-only\n", cvar->name);
@@ -864,40 +1021,42 @@ void Cvar_SetA_f (void)
 		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);
+	Cvar_Get(cvars, Cmd_Argv(cmd, 1), Cmd_Argv(cmd, 2), cmd->cvars_flagsmask | CVAR_SAVE, Cmd_Argc(cmd) > 3 ? Cmd_Argv(cmd, 3) : NULL);
 }
 
-void Cvar_Del_f (void)
+void Cvar_Del_f(cmd_state_t *cmd)
 {
+	cvar_state_t *cvars = cmd->cvars;
+	int neededflags = ~0;
 	int i;
 	cvar_t *cvar, *parent, **link, *prev;
 
-	if(Cmd_Argc() < 2)
+	if(Cmd_Argc(cmd) < 2)
 	{
-		Con_Printf("Del: wrong number of parameters, useage: unset <variablename1> [<variablename2> ...]\n");
+		Con_Printf("%s: wrong number of parameters, usage: unset <variablename1> [<variablename2> ...]\n", Cmd_Argv(cmd, 0));
 		return;
 	}
-	for(i = 1; i < Cmd_Argc(); ++i)
+	for(i = 1; i < Cmd_Argc(cmd); ++i)
 	{
-		cvar = Cvar_FindVarLink(Cmd_Argv(i), &parent, &link, &prev);
+		cvar = Cvar_FindVarLink(cvars, Cmd_Argv(cmd, i), &parent, &link, &prev, neededflags);
 		if(!cvar)
 		{
-			Con_Printf("Del: %s is not defined\n", Cmd_Argv(i));
+			Con_Printf("%s: %s is not defined\n", Cmd_Argv(cmd, 0), Cmd_Argv(cmd, i));
 			continue;
 		}
 		if(cvar->flags & CVAR_READONLY)
 		{
-			Con_Printf("Del: %s is read-only\n", cvar->name);
+			Con_Printf("%s: %s is read-only\n", Cmd_Argv(cmd, 0), cvar->name);
 			continue;
 		}
 		if(!(cvar->flags & CVAR_ALLOCATED))
 		{
-			Con_Printf("Del: %s is static and cannot be deleted\n", cvar->name);
+			Con_Printf("%s: %s is static and cannot be deleted\n", Cmd_Argv(cmd, 0), cvar->name);
 			continue;
 		}
-		if(cvar == cvar_vars)
+		if(cvar == cvars->vars)
 		{
-			cvar_vars = cvar->next;
+			cvars->vars = cvar->next;
 		}
 		else
 		{
@@ -912,35 +1071,35 @@ void Cvar_Del_f (void)
 			*link = cvar->nextonhashchain;
 
 		if(cvar->description != cvar_dummy_description)
-			Z_Free(cvar->description);
+			Z_Free((char *)cvar->description);
 
-		Z_Free(cvar->name);
-		Z_Free(cvar->string);
-		Z_Free(cvar->defstring);
+		Z_Free((char *)cvar->name);
+		Z_Free((char *)cvar->string);
+		Z_Free((char *)cvar->defstring);
 		Z_Free(cvar);
 	}
 }
 
 #ifdef FILLALLCVARSWITHRUBBISH
-void Cvar_FillAll_f()
+void Cvar_FillAll_f(cmd_state_t *cmd)
 {
 	char *buf, *p, *q;
 	int n, i;
 	cvar_t *var;
 	qboolean verify;
-	if(Cmd_Argc() != 2)
+	if(Cmd_Argc(cmd) != 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));
+		Con_Printf("Usage: %s length to plant rubbish\n", Cmd_Argv(cmd, 0));
+		Con_Printf("Usage: %s -length to verify that the rubbish is still there\n", Cmd_Argv(cmd, 0));
 		return;
 	}
-	n = atoi(Cmd_Argv(1));
+	n = atoi(Cmd_Argv(cmd, 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(var = cvars->vars; var; var = var->next)
 	{
 		for(i = 0, p = buf, q = var->name; i < n; ++i)
 		{