From: Jakob MG <jakob_mg@hotmail.com>
Date: Sun, 12 Jun 2011 11:15:08 +0000 (+0200)
Subject: Dont blow up vehicle when teamchangning
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=585a6274a7733375b014689322fa376cbe8ec1af;p=xonotic%2Fxonotic-data.pk3dir.git

Dont blow up vehicle when teamchangning
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index e0bdec8f1..83a6149db 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1275,8 +1275,11 @@ void ClientKill_Now()
 	    oldself = self;
 	    self = self.vehicle;
 	    vehicles_exit(VHEF_RELESE);
-	    self.vehicle_health = -1;
-	    Damage(self, self, self, 1 , DEATH_KILL, self.origin, '0 0 0');
+	    if(!oldself.killindicator_teamchange)
+	    {
+            self.vehicle_health = -1;
+            Damage(self, self, self, 1 , DEATH_KILL, self.origin, '0 0 0');	        
+	    }
 	    self = oldself;
 	}