the beginnings of a cgGL rendering path experiment, does not work yet

[xonotic/darkplaces.git] / cvar.c

diff --git a/cvar.c b/cvar.c
index 29e299e12a6d6bda8b170bc2bc007f3b9868f18c..30ba09fde88c87d399715ef14e48069f3b5481e0 100644 (file)
--- a/cvar.c
+++ b/cvar.c
@@ -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)
@@ -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;
 }
@@ -543,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;