implemented a new preallocated "boxbrush" type for use with

[xonotic/darkplaces.git] / cvar.c

diff --git a/cvar.c b/cvar.c
index 94fd37fc3e7f9105e388a5bea51a16fa06da8a6e..822f6e5e6266a0920743fe09d5434bbedd4ba26d 100644 (file)
--- a/cvar.c
+++ b/cvar.c
@@ -234,7 +234,7 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
        qboolean changed;
        size_t valuelen;
 
-       changed = strcmp(var->string, value);
+       changed = strcmp(var->string, value) != 0;
        // LordHavoc: don't reallocate when there is no change
        if (!changed)
                return;
@@ -299,7 +299,7 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
                        // whenever rcon_secure is changed to 0, clear rcon_password for
                        // security reasons (prevents a send-rcon-password-as-plaintext
                        // attack based on NQ protocol session takeover and svc_stufftext)
-                       if(!var->integer)
+                       if(var->integer <= 0)
                                Cvar_Set("rcon_password", "");
                }
                else if (!strcmp(var->name, "net_slist_favorites"))
@@ -617,7 +617,8 @@ void Cvar_ResetToDefaults_All_f (void)
        cvar_t *var;
        // restore the default values of all cvars
        for (var = cvar_vars ; var ; var = var->next)
-               Cvar_SetQuick(var, var->defstring);
+               if((var->flags & CVAR_NORESETTODEFAULTS) == 0)
+                       Cvar_SetQuick(var, var->defstring);
 }
 
 
@@ -626,7 +627,7 @@ void Cvar_ResetToDefaults_NoSaveOnly_f (void)
        cvar_t *var;
        // restore the default values of all cvars
        for (var = cvar_vars ; var ; var = var->next)
-               if (!(var->flags & CVAR_SAVE))
+               if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == 0)
                        Cvar_SetQuick(var, var->defstring);
 }
 
@@ -636,7 +637,7 @@ void Cvar_ResetToDefaults_SaveOnly_f (void)
        cvar_t *var;
        // restore the default values of all cvars
        for (var = cvar_vars ; var ; var = var->next)
-               if (var->flags & CVAR_SAVE)
+               if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == CVAR_SAVE)
                        Cvar_SetQuick(var, var->defstring);
 }