fix a logic bug in EntLight handling (should have been checking r_shadow_realtime_wor...

[xonotic/darkplaces.git] / cvar.c

diff --git a/cvar.c b/cvar.c
index 152a86aee4f52446aa95dd683d5b5484acfb4b09..db209739fd3c4995e4051fdc8ea7eedc7f797cf2 100644 (file)
--- a/cvar.c
+++ b/cvar.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -21,33 +21,57 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-cvar_t *cvar_vars;
-char   *cvar_null_string = "";
+cvar_t *cvar_vars = NULL;
+char *cvar_null_string = "";
 
 /*
 ============
 Cvar_FindVar
 ============
 */
-cvar_t *Cvar_FindVar (char *var_name)
+cvar_t *Cvar_FindVar (const char *var_name)
 {
-       cvar_t  *var;
+       cvar_t *var;
 
-       for (var=cvar_vars ; var ; var=var->next)
+       for (var = cvar_vars;var;var = var->next)
                if (!strcmp (var_name, var->name))
                        return var;
 
        return NULL;
 }
 
+cvar_t *Cvar_FindVarAfter (const char *prev_var_name, int neededflags)
+{
+       cvar_t *var;
+
+       if (*prev_var_name)
+       {
+               var = Cvar_FindVar (prev_var_name);
+               if (!var)
+                       return NULL;
+               var = var->next;
+       }
+       else
+               var = cvar_vars;
+
+       // search for the next cvar matching the needed flags
+       while (var)
+       {
+               if ((var->flags & neededflags) || !neededflags)
+                       break;
+               var = var->next;
+       }
+       return var;
+}
+
 /*
 ============
 Cvar_VariableValue
 ============
 */
-float  Cvar_VariableValue (char *var_name)
+float Cvar_VariableValue (const char *var_name)
 {
-       cvar_t  *var;
+       cvar_t *var;
 
        var = Cvar_FindVar (var_name);
        if (!var)
@@ -61,7 +85,7 @@ float Cvar_VariableValue (char *var_name)
 Cvar_VariableString
 ============
 */
-char *Cvar_VariableString (char *var_name)
+const char *Cvar_VariableString (const char *var_name)
 {
        cvar_t *var;
 
@@ -77,7 +101,7 @@ char *Cvar_VariableString (char *var_name)
 Cvar_CompleteVariable
 ============
 */
-char *Cvar_CompleteVariable (char *partial)
+const char *Cvar_CompleteVariable (const char *partial)
 {
        cvar_t          *cvar;
        int                     len;
@@ -104,8 +128,7 @@ char *Cvar_CompleteVariable (char *partial)
        Thanks to Fett erich@heintz.com
 
 */
-int
-Cvar_CompleteCountPossible (char *partial)
+int Cvar_CompleteCountPossible (const char *partial)
 {
        cvar_t  *cvar;
        int             len;
@@ -134,17 +157,16 @@ Cvar_CompleteCountPossible (char *partial)
        Thanks to taniwha
 
 */
-char   **
-Cvar_CompleteBuildList (char *partial)
+const char **Cvar_CompleteBuildList (const char *partial)
 {
-       cvar_t  *cvar;
-       int             len = 0;
-       int             bpos = 0;
-       int             sizeofbuf = (Cvar_CompleteCountPossible (partial) + 1) * sizeof (char *);
-       char    **buf;
+       const cvar_t *cvar;
+       int len = 0;
+       int bpos = 0;
+       int sizeofbuf = (Cvar_CompleteCountPossible (partial) + 1) * sizeof (const char *);
+       const char **buf;
 
        len = strlen(partial);
-       buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (char *));
+       buf = Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *));
        // Loop through the alias list and print all matches
        for (cvar = cvar_vars; cvar; cvar = cvar->next)
                if (!strncasecmp(partial, cvar->name, len))
@@ -159,7 +181,7 @@ Cvar_CompleteBuildList (char *partial)
 Cvar_Set
 ============
 */
-void Cvar_SetQuick (cvar_t *var, char *value)
+void Cvar_SetQuick (cvar_t *var, const char *value)
 {
        qboolean changed;
 
@@ -191,7 +213,7 @@ void Cvar_SetQuick (cvar_t *var, char *value)
        }
 }
 
-void Cvar_Set (char *var_name, char *value)
+void Cvar_Set (const char *var_name, const char *value)
 {
        cvar_t *var;
        var = Cvar_FindVar (var_name);
@@ -201,6 +223,11 @@ void Cvar_Set (char *var_name, char *value)
                Con_Printf ("Cvar_Set: variable %s not found\n", var_name);
                return;
        }
+       if (var->flags & CVAR_READONLY)
+       {
+               Con_Printf ("Cvar_Set: %s is read-only\n", var_name);
+               return;
+       }
 
        Cvar_SetQuick(var, value);
 }
@@ -210,22 +237,26 @@ void Cvar_Set (char *var_name, char *value)
 Cvar_SetValue
 ============
 */
-void Cvar_SetValueQuick (cvar_t *var, float value)
+void Cvar_SetValueQuick(cvar_t *var, float value)
 {
-       char    val[32];
+       char val[256];
 
-       // LordHavoc: changed from %f to %g to use shortest representation
-       sprintf (val, "%g",value);
-       Cvar_SetQuick (var, val);
+       if ((float)((int)value) == value)
+               sprintf(val, "%i", (int)value);
+       else
+               sprintf(val, "%f", value);
+       Cvar_SetQuick(var, val);
 }
 
-void Cvar_SetValue (char *var_name, float value)
+void Cvar_SetValue(const char *var_name, float value)
 {
-       char    val[32];
+       char val[256];
 
-       // LordHavoc: changed from %f to %g to use shortest representation
-       sprintf (val, "%g",value);
-       Cvar_Set (var_name, val);
+       if ((float)((int)value) == value)
+               sprintf(val, "%i", (int)value);
+       else
+               sprintf(val, "%f", value);
+       Cvar_Set(var_name, val);
 }
 
 /*
@@ -284,7 +315,9 @@ qboolean    Cvar_Command (void)
 // perform a variable print or set
        if (Cmd_Argc() == 1)
        {
-               Con_Printf ("\"%s\" is \"%s\"\n", v->name, v->string);
+               // only print if host_initialized (otherwise it could print twice if this is in a script)
+               if (host_initialized)
+                       Con_Printf ("\"%s\" is \"%s\"\n", v->name, v->string);
                return true;
        }
 
@@ -301,13 +334,13 @@ Writes lines containing "set variable value" for all variables
 with the archive flag set to true.
 ============
 */
-void Cvar_WriteVariables (QFile *f)
+void Cvar_WriteVariables (qfile_t *f)
 {
        cvar_t  *var;
 
        for (var = cvar_vars ; var ; var = var->next)
                if (var->flags & CVAR_SAVE)
-                       Qprintf (f, "%s \"%s\"\n", var->name, var->string);
+                       FS_Printf (f, "%s \"%s\"\n", var->name, var->string);
 }
 
 
@@ -320,21 +353,24 @@ Cvar_List
 */
 void Cvar_List_f (void)
 {
-       cvar_t  *cvar;
-       char    *partial;
-       int             len;
-       int             count;
+       cvar_t *cvar;
+       const char *partial;
+       int len, count;
 
-       if (Cmd_Argc() > 1) {
+       if (Cmd_Argc() > 1)
+       {
                partial = Cmd_Argv (1);
                len = strlen(partial);
-       } else {
+       }
+       else
+       {
                partial = NULL;
                len = 0;
        }
 
        count = 0;
-       for (cvar = cvar_vars; cvar; cvar = cvar->next) {
+       for (cvar = cvar_vars; cvar; cvar = cvar->next)
+       {
                if (partial && strncmp (partial,cvar->name,len))
                        continue;