X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cvar.c;h=8f3abc390a64e94d92aa8998b7df4c53154506ca;hb=3d164924a905fa9a5486f412fd1df10c3c3e9edf;hp=125f554b8d3cb970054c38f059c4943fb7a29396;hpb=cdc40956d38987591a9bdaf199fa0f9fcc6eb989;p=xonotic%2Fdarkplaces.git

diff --git a/cvar.c b/cvar.c
index 125f554b..8f3abc39 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;
@@ -233,6 +233,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 +307,49 @@ 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);
+			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;
+				}
+			}
+		}
+	}
+	prog = tmpprog;
 }
 
 void Cvar_SetQuick (cvar_t *var, const char *value)
@@ -315,8 +360,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 +419,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 +428,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 +461,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 +494,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 +512,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);
@@ -493,6 +538,13 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne
 		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))
 	{
@@ -536,7 +588,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;
 
@@ -567,7 +619,7 @@ qboolean	Cvar_Command (void)
 		return true;
 	}
 
-	if (developer.integer >= 100)
+	if (developer_extra.integer)
 		Con_DPrint("Cvar_Command: ");
 
 	if (v->flags & CVAR_READONLY)
@@ -576,7 +628,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;
 }
@@ -735,7 +787,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
@@ -761,7 +813,7 @@ void Cvar_SetA_f (void)
 		return;
 	}
 
-	if (developer.integer >= 100)
+	if (developer_extra.integer)
 		Con_DPrint("SetA: ");
 
 	// all looks ok, create/modify the cvar