Disable matrix if XONOTIC isn't defined

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / _all.inc

diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc
index cdacdc64c07bdc4fd6052832ed2e1e305783e77b..136c4e7f6ffb4ff7b7dc4d56a50c62f2478c15db 100644 (file)
--- a/qcsrc/lib/_all.inc
+++ b/qcsrc/lib/_all.inc
@@ -122,7 +122,9 @@ void    isnt_bool(float this) { print(ftos(this)); }
 #include "vector.qh"
 #include "yenc.qh"
 
-#include "matrix/_all.inc"
+#if XONOTIC
+       #include "matrix/_mod.inc"
+#endif
 
 #ifndef SVQC
 #define objerror_safe(e)
@@ -183,6 +185,12 @@ void make_safe_for_remove(entity this);
        void SetChangeParms() { ENGINE_EVENT(); if (_SetChangeParms) _SetChangeParms(this); }
        #define SetChangeParms _SetChangeParms
 
+#ifdef DP_EXT_PRECONNECT
+       void _ClientPreConnect(entity this);
+       void ClientPreConnect() { ENGINE_EVENT(); if (_ClientPreConnect) _ClientPreConnect(this); }
+       #define ClientPreConnect _ClientPreConnect
+#endif
+
        void _ClientConnect(entity this);
        void ClientConnect() { ENGINE_EVENT(); if (_ClientConnect) _ClientConnect(this); }
        #define ClientConnect _ClientConnect
@@ -266,7 +274,8 @@ void make_safe_for_remove(entity this);
 #endif
 #undef ENGINE_EVENT
 
-#ifndef MENUQC
-       #include <ecs/_lib.qh>
-       #include <ecs/components/_mod.qh>
+#if XONOTIC
+#ifdef GAMEQC
+       #include <ecs/_mod.qh>
+#endif
 #endif