]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Dont blow up vehicle when teamchangning
authorJakob MG <jakob_mg@hotmail.com>
Sun, 12 Jun 2011 11:15:08 +0000 (13:15 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sun, 12 Jun 2011 11:15:08 +0000 (13:15 +0200)
qcsrc/server/cl_client.qc

index e0bdec8f1ee572482fd757c6f1268194a8346d28..83a6149db15ed3eda3e9632e8a8434c440168569 100644 (file)
@@ -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;
        }