Merge remote branch 'origin/master' into akari/irc

[xonotic/darkplaces.git] / cvar.h

diff --git a/cvar.h b/cvar.h
index e80edc071364066266f5317e08eb2ca88c7230bf..4fd177d65407b10c421e413cd21ffa7dc1051ab5 100644 (file)
--- a/cvar.h
+++ b/cvar.h
@@ -165,9 +165,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