Merge branch 'TimePath/globalforces' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / all.qc

diff --git a/qcsrc/common/turrets/all.qc b/qcsrc/common/turrets/all.qc
index c23a13861ecc9a182e11d16abb516b440cb1908e..469a64c9274b240758ebd40eeeb8d4f19576d767 100644 (file)
--- a/qcsrc/common/turrets/all.qc
+++ b/qcsrc/common/turrets/all.qc
@@ -1,22 +1,23 @@
 #include "all.qh"
 
-Turret get_turretinfo(int id)
-{
-    if (id < 1 || id > TUR_COUNT - 1)
-        return TUR_Null;
-    Turret m = turret_info[id];
-    if (m) return m;
-    return TUR_Null;
-}
+REGISTER_NET_LINKED(ENT_CLIENT_TURRET)
 
 #ifdef SVQC
 #include "sv_turrets.qh"
 #endif
 
+#define IMPLEMENTATION
+#include "turret/_mod.inc"
+#undef IMPLEMENTATION
+
 #ifdef CSQC
-#include "cl_turrets.qh"
+#include "cl_turrets.qc"
 #endif
 
-#define IMPLEMENTATION
-#include "all.inc"
-#undef IMPLEMENTATION
+#ifdef SVQC
+#include "sv_turrets.qc"
+#include "config.qc"
+#include "util.qc"
+#include "checkpoint.qc"
+#include "targettrigger.qc"
+#endif