Merge remote-tracking branch 'origin/master' into terencehill/spectate_prev

[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 b65193d44ce26e6341b042b09c24c6283cf1da59..1c2c1cc9f266fdb2fdc16ab627e95fd46ca9be18 100644 (file)
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@ -1,11 +1,23 @@
+#ifdef FTEQCC
 #pragma flag enable subscope
 #pragma flag enable lo
+#endif
+
+// FTEQCC can do this
+#define HAVE_YO_DAWG_CPP
 
 #ifndef NOCOMPAT
 //# define WORKAROUND_XON010
 //# define COMPAT_XON010_CHANNELS
-# define COMPAT_XON050_ENGINE
+//# define COMPAT_XON050_ENGINE
 # define COMPAT_NO_MOD_IS_XONOTIC
 # define COMPAT_XON060_DONTCRASH_CHECKPVS
 #endif
 
+#ifdef FTEQCC
+#ifdef WATERMARK
+string FTEQCC_SUCKS_WATERMARKS_THROUGH_C60_FULLERENES = WATERMARK();
+#undef WATERMARK
+#define WATERMARK FTEQCC_SUCKS_WATERMARKS_THROUGH_C60_FULLERENES
+#endif
+#endif