Reworked v_isometric code significantly, it now defaults to a proper isometric view...

[xonotic/darkplaces.git] / cvar.c

diff --git a/cvar.c b/cvar.c
index 06afc0d2295141b01d4b1b78407d3723550eb491..2a0acae8edefad814c472bf0df404c64b6e7925e 100644 (file)
--- a/cvar.c
+++ b/cvar.c
@@ -262,6 +262,20 @@ void Cvar_CompleteCvarPrint (const char *partial)
                        Con_Printf ("^3%s^7 is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description);
 }
 
+// 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)
 {
@@ -273,7 +287,7 @@ static void Cvar_UpdateAutoCvar(cvar_t *var)
        for (i = 0;i < PRVM_PROG_MAX;i++)
        {
                prog = &prvm_prog_list[i];
-               if (prog->loaded && var->globaldefindex_progid[i] == prog->id)
+               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)
@@ -397,8 +411,10 @@ static void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
                        if(var->integer <= 0)
                                Cvar_Set("rcon_password", "");
                }
+#ifdef CONFIG_MENU
                else if (!strcmp(var->name, "net_slist_favorites"))
                        NetConn_UpdateFavorites();
+#endif
        }
 
        Cvar_UpdateAutoCvar(var);
@@ -470,6 +486,7 @@ void Cvar_RegisterVariable (cvar_t *variable)
        cvar_t *current, *next, *cvar;
        char *oldstr;
        size_t alloclen;
+       int i;
 
        if (developer_extra.integer)
                Con_DPrintf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags);
@@ -492,6 +509,9 @@ 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)
@@ -534,6 +554,10 @@ void Cvar_RegisterVariable (cvar_t *variable)
        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 )
@@ -562,6 +586,7 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne
 {
        int hashindex;
        cvar_t *current, *next, *cvar;
+       int i;
 
        if (developer_extra.integer)
                Con_DPrintf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags);
@@ -615,6 +640,10 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne
        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 )
@@ -749,6 +778,18 @@ void Cvar_RestoreInitState(void)
                        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;
                        }