X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cvar.h;h=0ed510ab72012528b8f45ebad19b45a97cd2cfe0;hp=4e3e97901817f46f8b8461e75831bdb05705dc14;hb=456bdec8d560cc7fd8ccdd8bae33fdf35bc4a51b;hpb=0256e57e16a302ad45090618b8d6eb5930788809

diff --git a/cvar.h b/cvar.h
index 4e3e9790..0ed510ab 100644
--- a/cvar.h
+++ b/cvar.h
@@ -57,9 +57,13 @@ interface from being ambiguous.
 #define CVAR_H
 
 // cvar flags
+
 #define CVAR_SAVE 1
 #define CVAR_NOTIFY 2
+#define	CVAR_READONLY 4
+#define CVAR_MAXFLAGSVAL 7 // used to determine if flags is valid
 
+/*
 // type of a cvar for menu purposes
 #define CVARMENUTYPE_FLOAT 1
 #define CVARMENUTYPE_INTEGER 2
@@ -80,58 +84,61 @@ interface from being ambiguous.
 typedef struct
 {
 	int value;
-	char *name;
+	const char *name;
 }
 cvaroption_t;
 
 typedef struct
 {
-	int				type;
-	float			valuemin, valuemax, valuestep;
-	int				numoptions;
-	cvaroption_t	optionlist[MAX_CVAROPTIONS];
+	int type;
+	float valuemin, valuemax, valuestep;
+	int numoptions;
+	cvaroption_t optionlist[MAX_CVAROPTIONS];
 }
 menucvar_t;
+*/
 
 typedef struct cvar_s
 {
-	int				flags;
-	char			*name;
-	char			*string;
-	int				integer;
-	float			value;
-	float			vector[3];
-	menucvar_t		menuinfo;
-	struct cvar_s	*next;
+	int flags;
+	char *name;
+	char *string;
+	int integer;
+	float value;
+	float vector[3];
+	//menucvar_t menuinfo;
+	struct cvar_s *next;
 } cvar_t;
 
-void	Cvar_MenuSlider(cvar_t *variable, int menu, float slider_min, float slider_max, float slider_step);
-void	Cvar_MenuBool(cvar_t *variable, int menu, char *name_false, char *name_true);
-void	Cvar_MenuFloat(cvar_t *variable, int menu, float range_min, float range_max);
-void	Cvar_MenuInteger(cvar_t *variable, int menu, int range_min, int range_max);
-void	Cvar_MenuString(cvar_t *variable, int menu);
-void	Cvar_MenuOption(cvar_t *variable, int menu, int value[16], char *name[16]);
+/*
+void Cvar_MenuSlider(cvar_t *variable, int menu, float slider_min, float slider_max, float slider_step);
+void Cvar_MenuBool(cvar_t *variable, int menu, const char *name_false, const char *name_true);
+void Cvar_MenuFloat(cvar_t *variable, int menu, float range_min, float range_max);
+void Cvar_MenuInteger(cvar_t *variable, int menu, int range_min, int range_max);
+void Cvar_MenuString(cvar_t *variable, int menu);
+void Cvar_MenuOption(cvar_t *variable, int menu, int value[16], const char *name[16]);
+*/
 
-void	Cvar_RegisterVariable (cvar_t *variable);
+void Cvar_RegisterVariable (cvar_t *variable);
 // registers a cvar that already has the name, string, and optionally the
 // archive elements set.
 
-void	Cvar_Set (char *var_name, char *value);
+void Cvar_Set (const char *var_name, const char *value);
 // equivelant to "<name> <variable>" typed at the console
 
-void	Cvar_SetValue (char *var_name, float value);
+void Cvar_SetValue (const char *var_name, float value);
 // expands value to a string and calls Cvar_Set
 
-void	Cvar_SetQuick (cvar_t *var, char *value);
-void	Cvar_SetValueQuick (cvar_t *var, float value);
+void Cvar_SetQuick (cvar_t *var, const char *value);
+void Cvar_SetValueQuick (cvar_t *var, float value);
 
-float	Cvar_VariableValue (char *var_name);
+float Cvar_VariableValue (const char *var_name);
 // returns 0 if not defined or non numeric
 
-char	*Cvar_VariableString (char *var_name);
+const char *Cvar_VariableString (const char *var_name);
 // returns an empty string if not defined
 
-char 	*Cvar_CompleteVariable (char *partial);
+const char *Cvar_CompleteVariable (const char *partial);
 // attempts to match a partial variable name for command line completion
 // returns NULL if nothing fits
 
@@ -140,21 +147,20 @@ qboolean Cvar_Command (void);
 // command.  Returns true if the command was a variable reference that
 // was handled. (print or change)
 
-void 	Cvar_WriteVariables (QFile *f);
+void Cvar_WriteVariables (qfile_t *f);
 // Writes lines containing "set variable value" for all variables
 // with the archive flag set to true.
 
-cvar_t *Cvar_FindVar (char *var_name);
-
-extern cvar_t	*cvar_vars;
+cvar_t *Cvar_FindVar (const char *var_name);
+cvar_t *Cvar_FindVarAfter (const char *prev_var_name, int neededflags);
 
-int		Cvar_CompleteCountPossible (char *partial);
-char	**Cvar_CompleteBuildList (char *partial);
+int Cvar_CompleteCountPossible (const char *partial);
+const char **Cvar_CompleteBuildList (const char *partial);
 // Added by EvilTypeGuy - functions for tab completion system
 // Thanks to Fett erich@heintz.com
 // Thanks to taniwha
 
-void	Cvar_List_f (void);
+void Cvar_List_f (void);
 // Prints a list of Cvars including a count of them to the user console
 // Referenced in cmd.c in Cmd_Init hence it's inclusion here
 // Added by EvilTypeGuy eviltypeguy@qeradiant.com