fix a compile error

[xonotic/darkplaces.git] / cvar.c

diff --git a/cvar.c b/cvar.c
index 111550a8632107df7d141d4aebf2592965cdc128..8f3abc390a64e94d92aa8998b7df4c53154506ca 100644 (file)
--- a/cvar.c
+++ b/cvar.c
@@ -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;
        }
 
@@ -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);
@@ -574,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)
@@ -583,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;
 }
@@ -742,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
@@ -768,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