Merge branch 'master' into Mario/movetype_push

[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..6c766126187c36af01ac6d30e43a443ffc40c4c8 100644 (file)
--- a/qcsrc/common/turrets/all.qc
+++ b/qcsrc/common/turrets/all.qc
@@ -1,22 +1,5 @@
 #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;
-}
-
-#ifdef SVQC
-#include "sv_turrets.qh"
-#endif
-
-#ifdef CSQC
-#include "cl_turrets.qh"
+#ifdef GAMEQC
+REGISTER_NET_LINKED(ENT_CLIENT_TURRET)
 #endif
-
-#define IMPLEMENTATION
-#include "all.inc"
-#undef IMPLEMENTATION