Merge branch 'master' into terencehill/welcome_dialog_translatable

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

diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc
index e2a9ab2e4131bee26615108eb55873baef2c27a1..1b5e7cdb84ed9e098cd0f0dfff71931bbbb48ec0 100644 (file)
--- a/qcsrc/common/turrets/sv_turrets.qc
+++ b/qcsrc/common/turrets/sv_turrets.qc
@@ -1,11 +1,12 @@
 #include "sv_turrets.qh"
+
 #ifdef SVQC
-#include <server/autocvars.qh>
+#include <common/mapobjects/defs.qh>
 #include <server/bot/api.qh>
 #include <server/damage.qh>
 #include <server/weapons/common.qh>
 #include <server/weapons/weaponsystem.qh>
-#include <common/mapobjects/defs.qh>
+#include <server/world.qh>
 
 // Generic aiming
 vector turret_aim_generic(entity this)
@@ -1255,7 +1256,7 @@ void turret_findtarget(entity this)
        entity e = find(NULL, classname, "turret_manager");
        if(!e)
        {
-               e = new(turret_manager);
+               e = new_pure(turret_manager);
                setthink(e, turrets_manager_think);
                e.nextthink = time + 2;
        }