Merge remote branch 'origin/terencehill/incompatible_mutators'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / util-pre.qh

diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh
index 589691dbe9100d233ad88468a7acb63e13566201..518a5698d3aead0d6b4fe0a98bce583e89f7f92d 100644 (file)
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@ -1,7 +1,9 @@
+#pragma flag enable subscope
 #pragma flag enable lo
 
-//float log(float x);
-#define log log_builtin \
-       #undef log \
-       /* turn the next use of "log" into a declaration of log_builtin */
-
+#ifndef NOCOMPAT
+//# define WORKAROUND_XON010
+//# define COMPAT_XON010_CHANNELS
+# define COMPAT_XON050_ENGINE
+# define COMPAT_NO_MOD_IS_XONOTIC
+#endif