Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_teleporters.qc

diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc
index 46df0eb78636d45f82d5cab7e64ff1f2cdfa412f..53704a06f7e35a6c5b64923d9f10af9b4395552a 100644 (file)
--- a/qcsrc/server/t_teleporters.qc
+++ b/qcsrc/server/t_teleporters.qc
@@ -13,7 +13,6 @@
     #include "constants.qh"
     #include "defs.qh"
     #include "../common/deathtypes.qh"
-    #include "tturrets/include/turrets_early.qh"
     #include "vehicles/vehicles_def.qh"
     #include "../common/mapinfo.qh"
     #include "anticheat.qh"
@@ -195,7 +194,7 @@ void Teleport_Touch (void)
        if(!other.vehicle.teleportable)
                return;
 
-       if(other.turrcaps_flags & TFL_TURRCAPS_ISTURRET)
+       if(other.turret_flags & TUR_FLAG_ISTURRET)
                return;
 
        if(other.deadflag != DEAD_NO)