X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cvar.h;h=2ac7f451c4f3690b1f340a0dbb18fe7d0973c2a4;hb=83bdd42709b43836745d7ec9f0a3f61c356756c9;hp=636ca40b6c0c963f0e55c74e6cc078e5b559ea40;hpb=7552885ae0db4b06e323f60ad00e43274adcdd61;p=xonotic%2Fdarkplaces.git

diff --git a/cvar.h b/cvar.h
index 636ca40b..2ac7f451 100644
--- a/cvar.h
+++ b/cvar.h
@@ -114,17 +114,26 @@ 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;
 
-	unsigned int globaldefindex_progid[3];
 	int globaldefindex[3];
 	int globaldefindex_stringno[3];
 
@@ -155,9 +164,15 @@ void Cvar_SetValue (const char *var_name, float value);
 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
 
@@ -178,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);
@@ -205,6 +223,7 @@ void Cvar_List_f (void);
 
 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)
 
@@ -212,9 +231,11 @@ void Cvar_SetA_f (void);
 /// or merely sets its value if it already exists.
 cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *newdescription);
 
-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 */