changed default snd_soundradius from 1000 to 2000, matching proquake (which attempts...

[xonotic/darkplaces.git] / cvar.c

diff --git a/cvar.c b/cvar.c
index 6767ea61418f9893c8d88fac2da357a80ec92489..98892d70c9def548eaed4ecae627831205b169c9 100644 (file)
--- a/cvar.c
+++ b/cvar.c
@@ -250,6 +250,28 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 #endif
        if ((var->flags & CVAR_USERINFO) && cls.state != ca_dedicated)
                CL_SetInfo(var->name, var->string, true, false, false, false);
+       else if ((var->flags & CVAR_NQUSERINFOHACK) && cls.state != ca_dedicated)
+       {
+               // update the cls.userinfo to have proper values for the
+               // silly nq config variables.
+               //
+               // this is done when these variables are changed rather than at
+               // connect time because if the user or code checks the userinfo and it
+               // holds weird values it may cause confusion...
+               if (!strcmp(var->name, "_cl_color"))
+               {
+                       CL_SetInfo("topcolor", va("%i", (var->integer >> 4) & 15), true, false, false, false);
+                       CL_SetInfo("bottomcolor", va("%i", (var->integer) & 15), true, false, false, false);
+               }
+               else if (!strcmp(var->name, "_cl_rate"))
+                       CL_SetInfo("rate", va("%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"))
+                       CL_SetInfo("playermodel", var->string, true, false, false, false);
+               else if (!strcmp(var->name, "_cl_name"))
+                       CL_SetInfo("name", var->string, true, false, false, false);
+       }
 }
 
 void Cvar_SetQuick (cvar_t *var, const char *value)
@@ -505,6 +527,15 @@ qboolean   Cvar_Command (void)
 }
 
 
+void Cvar_UnlockDefaults (void)
+{
+       cvar_t *var;
+       // unlock the default values of all cvars
+       for (var = cvar_vars ; var ; var = var->next)
+               var->flags &= ~CVAR_DEFAULTSET;
+}
+
+
 void Cvar_LockDefaults_f (void)
 {
        cvar_t *var;
@@ -569,7 +600,7 @@ void Cvar_WriteVariables (qfile_t *f)
 
        // don't save cvars that match their default value
        for (var = cvar_vars ; var ; var = var->next)
-               if (var->flags & CVAR_SAVE && strcmp(var->string, var->defstring))
+               if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || (var->flags & CVAR_ALLOCATED)))
                        FS_Printf(f, "%s%s \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", var->name, var->string);
 }