X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cvar.c;h=c6f69360825f07765f71b485561f40370f17ae09;hb=22a8aa8024a5ba6033460fceba380ee999c6ac43;hp=a6734b53adc892a02f8b97db9a1dcbe056488723;hpb=d4ff7e4d36f00ec7b8697b4df26c279cdd332ba6;p=xonotic%2Fdarkplaces.git

diff --git a/cvar.c b/cvar.c
index a6734b53..c6f69360 100644
--- a/cvar.c
+++ b/cvar.c
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 char *cvar_dummy_description = "custom cvar";
 
 cvar_t *cvar_vars = NULL;
-cvar_t *cvar_hashtable[65536];
+cvar_t *cvar_hashtable[CVAR_HASHSIZE];
 char *cvar_null_string = "";
 
 /*
@@ -38,7 +38,7 @@ cvar_t *Cvar_FindVar (const char *var_name)
 	cvar_t *var;
 
 	// use hash lookup to minimize search time
-	hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name));
+	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;
@@ -70,6 +70,36 @@ cvar_t *Cvar_FindVarAfter (const char *prev_var_name, int neededflags)
 	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;
+
+	// 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;
+}
+
 /*
 ============
 Cvar_VariableValue
@@ -223,6 +253,55 @@ void Cvar_CompleteCvarPrint (const char *partial)
 			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);
+}
 
 /*
 ============
@@ -233,6 +312,8 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 {
 	qboolean changed;
 	size_t valuelen;
+	prvm_prog_t *tmpprog;
+	int i;
 
 	changed = strcmp(var->string, value) != 0;
 	// LordHavoc: don't reallocate when there is no change
@@ -305,6 +386,17 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 		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)
@@ -315,8 +407,8 @@ void Cvar_SetQuick (cvar_t *var, const char *value)
 		return;
 	}
 
-	if (developer.integer >= 100)
-		Con_Printf("Cvar_SetQuick({\"%s\", \"%s\", %i, \"%s\"}, \"%s\");\n", var->name, var->string, var->flags, var->defstring, value);
+	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);
 }
@@ -374,8 +466,8 @@ void Cvar_RegisterVariable (cvar_t *variable)
 	char *oldstr;
 	size_t alloclen;
 
-	if (developer.integer >= 100)
-		Con_Printf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags);
+	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);
@@ -383,8 +475,8 @@ void Cvar_RegisterVariable (cvar_t *variable)
 	{
 		if (cvar->flags & CVAR_ALLOCATED)
 		{
-			if (developer.integer >= 100)
-				Con_Printf("...  replacing existing allocated cvar {\"%s\", \"%s\", %i}\n", cvar->name, cvar->string, cvar->flags);
+			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
@@ -416,7 +508,7 @@ void Cvar_RegisterVariable (cvar_t *variable)
 			Z_Free(cvar);
 		}
 		else
-			Con_Printf("Can't register variable %s, already defined\n", variable->name);
+			Con_DPrintf("Can't register variable %s, already defined\n", variable->name);
 		return;
 	}
 
@@ -449,7 +541,7 @@ void Cvar_RegisterVariable (cvar_t *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));
+	hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name)) % CVAR_HASHSIZE;
 	variable->nextonhashchain = cvar_hashtable[hashindex];
 	cvar_hashtable[hashindex] = variable;
 }
@@ -467,8 +559,8 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne
 	cvar_t *current, *next, *cvar;
 	size_t alloclen;
 
-	if (developer.integer >= 100)
-		Con_Printf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags);
+	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);
@@ -543,7 +635,7 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne
 	cvar->next = next;
 
 	// link to head of list in this hash table index
-	hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name));
+	hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name)) % CVAR_HASHSIZE;
 	cvar->nextonhashchain = cvar_hashtable[hashindex];
 	cvar_hashtable[hashindex] = cvar;
 
@@ -574,7 +666,7 @@ qboolean	Cvar_Command (void)
 		return true;
 	}
 
-	if (developer.integer >= 100)
+	if (developer_extra.integer)
 		Con_DPrint("Cvar_Command: ");
 
 	if (v->flags & CVAR_READONLY)
@@ -583,7 +675,7 @@ qboolean	Cvar_Command (void)
 		return true;
 	}
 	Cvar_Set (v->name, Cmd_Argv(1));
-	if (developer.integer >= 100)
+	if (developer_extra.integer)
 		Con_DPrint("\n");
 	return true;
 }
@@ -742,7 +834,7 @@ void Cvar_Set_f (void)
 		return;
 	}
 
-	if (developer.integer >= 100)
+	if (developer_extra.integer)
 		Con_DPrint("Set: ");
 
 	// all looks ok, create/modify the cvar
@@ -768,13 +860,67 @@ void Cvar_SetA_f (void)
 		return;
 	}
 
-	if (developer.integer >= 100)
+	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(cvar->description);
+
+		Z_Free(cvar->name);
+		Z_Free(cvar->string);
+		Z_Free(cvar->defstring);
+		Z_Free(cvar);
+	}
+}
+
 #ifdef FILLALLCVARSWITHRUBBISH
 void Cvar_FillAll_f()
 {