Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / sv_monsters.qc

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 887ac20ec3be81b4cb4d7c8baf2069dc17212db1..b453ba25714c26942dc1308adb50660cd372ff11 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -14,7 +14,9 @@
     #include "../../server/defs.qh"
     #include "../deathtypes.qh"
     #include "../../server/mutators/mutators_include.qh"
-    #include "../../server/tturrets/include/turrets_early.qh"
+    #include "../../server/steerlib.qh"
+    #include "../turrets/sv_turrets.qh"
+    #include "../turrets/util.qh"
     #include "../vehicles/sv_vehicles.qh"
     #include "../../server/campaign.qh"
     #include "../../server/command/common.qh"
@@ -22,7 +24,6 @@
        #include "../triggers/triggers.qh"
     #include "../../csqcmodellib/sv_model.qh"
     #include "../../server/round_handler.qh"
-    #include "../../server/tturrets/include/turrets.qh"
 #endif
 
 // =========================