From: Jakob MG <jakob_mg@hotmail.com>
Date: Sat, 31 Dec 2011 11:09:58 +0000 (+0100)
Subject: Stop turrets from using teleporters. More explicitly forbid vehicles from using telep... 
X-Git-Tag: xonotic-v0.6.0~189^2~20^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=37032a77641c9838fba153f9d00fb1eacf137176;p=xonotic%2Fxonotic-data.pk3dir.git

Stop turrets from using teleporters. More explicitly forbid vehicles from using teleports (still dont work tough. hmpf.)
---

diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc
index 5d5b0a02c..1705d8f8e 100644
--- a/qcsrc/server/t_teleporters.qc
+++ b/qcsrc/server/t_teleporters.qc
@@ -201,7 +201,13 @@ void Teleport_Touch (void)
 	// for gameplay: vehicles can't teleport
 	if (other.vehicle_flags & VHF_ISVEHICLE)
 		return;
-
+    
+    if(other.vehicle)
+        return;
+        
+    if(other.turrcaps_flags & TFL_TURRCAPS_ISTURRET)
+        return;
+        
 	if (other.deadflag != DEAD_NO)
 		return;