X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cvar.h;h=2ac7f451c4f3690b1f340a0dbb18fe7d0973c2a4;hp=70f85fc92a060917c0a35e9e3b0e9b9c3de04819;hb=563fb48299f453ecb3b81168079df8d30c0ac311;hpb=27ad2d336694ea2dc50035130bae321316e3936f;ds=sidebyside

diff --git a/cvar.h b/cvar.h
index 70f85fc9..2ac7f451 100644
--- a/cvar.h
+++ b/cvar.h
@@ -68,7 +68,9 @@ interface from being ambiguous.
 // this means that this cvar should update a userinfo key but the name does not correspond directly to the userinfo key to update, and may require additional conversion ("_cl_color" for example should update "topcolor" and "bottomcolor")
 #define CVAR_NQUSERINFOHACK 64
 // used to determine if flags is valid
-#define CVAR_MAXFLAGSVAL 127
+#define CVAR_NORESETTODEFAULTS 128
+// for engine-owned cvars that must not be reset on gametype switch (e.g. scr_screenshot_name, which otherwise isn't set to the mod name properly)
+#define CVAR_MAXFLAGSVAL 255
 // for internal use only!
 #define CVAR_DEFAULTSET (1<<30)
 #define CVAR_ALLOCATED (1<<31)
@@ -112,15 +114,28 @@ typedef struct cvar_s
 {
 	int flags;
 
-	char *name;
+	const char *name;
 
-	char *string;
-	char *description;
+	const char *string;
+	const char *description;
 	int integer;
 	float value;
 	float vector[3];
 
-	char *defstring;
+	const char *defstring;
+
+	// values at init (for Cvar_RestoreInitState)
+	qboolean initstate; // indicates this existed at init
+	int initflags;
+	const char *initstring;
+	const char *initdescription;
+	int initinteger;
+	float initvalue;
+	float initvector[3];
+	const char *initdefstring;
+
+	int globaldefindex[3];
+	int globaldefindex_stringno[3];
 
 	//menucvar_t menuinfo;
 	struct cvar_s *next;
@@ -136,22 +151,28 @@ void Cvar_MenuString(cvar_t *variable, int menu);
 void Cvar_MenuOption(cvar_t *variable, int menu, int value[16], const char *name[16]);
 */
 
+/// registers a cvar that already has the name, string, and optionally the
+/// archive elements set.
 void Cvar_RegisterVariable (cvar_t *variable);
-// registers a cvar that already has the name, string, and optionally the
-// archive elements set.
 
+/// equivelant to "<name> <variable>" typed at the console
 void Cvar_Set (const char *var_name, const char *value);
-// equivelant to "<name> <variable>" typed at the console
 
+/// expands value to a string and calls Cvar_Set
 void Cvar_SetValue (const char *var_name, float value);
-// expands value to a string and calls Cvar_Set
 
 void Cvar_SetQuick (cvar_t *var, const char *value);
 void Cvar_SetValueQuick (cvar_t *var, float value);
 
+float Cvar_VariableValueOr (const char *var_name, float def);
+// returns def if not defined
+
 float Cvar_VariableValue (const char *var_name);
 // returns 0 if not defined or non numeric
 
+const char *Cvar_VariableStringOr (const char *var_name, const char *def);
+// returns def if not defined
+
 const char *Cvar_VariableString (const char *var_name);
 // returns an empty string if not defined
 
@@ -172,6 +193,9 @@ qboolean Cvar_Command (void);
 // command.  Returns true if the command was a variable reference that
 // was handled. (print or change)
 
+void Cvar_SaveInitState(void);
+void Cvar_RestoreInitState(void);
+
 void Cvar_UnlockDefaults (void);
 void Cvar_LockDefaults_f (void);
 void Cvar_ResetToDefaults_All_f (void);
@@ -191,23 +215,30 @@ const char **Cvar_CompleteBuildList (const char *partial);
 // Thanks to Fett erich@heintz.com
 // Thanks to taniwha
 
+/// 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
+/// Thanks to Matthias "Maddes" Buecher, http://www.inside3d.com/qip/
 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
-// Thanks to Matthias "Maddes" Buecher, http://www.inside3d.com/qip/
 
 void Cvar_Set_f (void);
 void Cvar_SetA_f (void);
+void Cvar_Del_f (void);
 // commands to create new cvars (or set existing ones)
 // seta creates an archived cvar (saved to config)
 
+/// allocates a cvar by name and returns its address,
+/// or merely sets its value if it already exists.
 cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *newdescription);
-// allocates a cvar by name and returns its address,
-// or merely sets its value if it already exists.
 
-extern char *cvar_dummy_description; // ALWAYS the same pointer
+extern const char *cvar_dummy_description; // ALWAYS the same pointer
 extern cvar_t *cvar_vars; // used to list all cvars
 
+void Cvar_UpdateAllAutoCvars(void); // updates ALL autocvars of the active prog to the cvar values (savegame loading)
+
+#ifdef FILLALLCVARSWITHRUBBISH
+void Cvar_FillAll_f();
+#endif /* FILLALLCVARSWITHRUBBISH */
+
 #endif