Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / miscfunctions.qh

diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh
index 3cddc88f4a95388995cd181ed898aa0206fd4cce..949e0e997513108b80259c148140ddfa7476a8ee 100644 (file)
--- a/qcsrc/server/miscfunctions.qh
+++ b/qcsrc/server/miscfunctions.qh
@@ -11,24 +11,6 @@
 #include <common/mapinfo.qh>
 #include <common/turrets/all.qh>
 
-#if 1
-#define cvar_string_normal builtin_cvar_string
-#define cvar_normal builtin_cvar
-#else
-string cvar_string_normal(string n)
-{
-       if (!(cvar_type(n) & CVAR_TYPEFLAG_EXISTS))
-               backtrace(strcat("Attempt to access undefined cvar: ", n));
-       return builtin_cvar_string(n);
-}
-
-float cvar_normal(string n)
-{
-       return stof(cvar_string_normal(n));
-}
-#endif
-#define cvar_set_normal builtin_cvar_set
-
 .vector dropped_origin;
 
 entity eliminatedPlayers;