Fix a type issue where SDL_GLContext * was being used instead of

[xonotic/darkplaces.git] / cvar.c

diff --git a/cvar.c b/cvar.c
index b88aafd0374d761bb47dd97697fb40f44f729feb..5ae8e521c53b6daf2231ceda3732606b1edbdecc 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_progid[i] == prog->id)
+                       return true;
+       }
+       return false;
+}
+
 // we assume that prog is already set to the target progs
 static void Cvar_UpdateAutoCvar(cvar_t *var)
 {
@@ -381,6 +395,8 @@ static void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
                }
                else if (!strcmp(var->name, "_cl_rate"))
                        CL_SetInfo("rate", va(vabuf, sizeof(vabuf), "%i", var->integer), true, false, false, false);
+               else if (!strcmp(var->name, "_cl_rate_burstsize"))
+                       CL_SetInfo("rate_burstsize", va(vabuf, sizeof(vabuf), "%i", var->integer), true, false, false, false);
                else if (!strcmp(var->name, "_cl_playerskin"))
                        CL_SetInfo("playerskin", var->string, true, false, false, false);
                else if (!strcmp(var->name, "_cl_playermodel"))
@@ -395,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);
@@ -747,6 +765,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;
                        }