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 8f15a4f820c428c976ca17d5871ce178d99b9b6e..94f690f719b83b6729bfa78de32fbe81c3275570 100644 (file)
--- a/qcsrc/server/t_teleporters.qc
+++ b/qcsrc/server/t_teleporters.qc
@@ -209,7 +209,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)