From: Mario <mario@smbclan.net>
Date: Sun, 12 Jun 2016 15:37:15 +0000 (+1000)
Subject: Fix bumblebee gunners
X-Git-Tag: xonotic-v0.8.2~813
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=638035ebe20a190dd3b1533a1172bdaafeb11fb0;p=xonotic%2Fxonotic-data.pk3dir.git

Fix bumblebee gunners
---

diff --git a/qcsrc/common/vehicles/vehicle/bumblebee.qc b/qcsrc/common/vehicles/vehicle/bumblebee.qc
index ac98dadbe..62830bd55 100644
--- a/qcsrc/common/vehicles/vehicle/bumblebee.qc
+++ b/qcsrc/common/vehicles/vehicle/bumblebee.qc
@@ -235,8 +235,8 @@ vector bumblebee_gunner_findgoodexit(vector prefer_spot, entity gunner, entity p
 
 void bumblebee_gunner_exit(entity this, int _exitflag)
 {
-	entity player = this;
-	entity gunner = player.vehicle;
+	entity player = ((this.owner.gun1 == this) ? this.owner.gunner1 : this.owner.gunner2);
+	entity gunner = this;
 	entity vehic = gunner.owner;
 
 	if(IS_REAL_CLIENT(player))
@@ -744,7 +744,7 @@ METHOD(Bumblebee, vr_think, void(Bumblebee thisveh, entity instance))
         if(instance.gunner1)
         {
         	entity e = instance.gunner1;
-        	instance.gun1.vehicle_exit(e, VHEF_EJECT);
+        	instance.gun1.vehicle_exit(instance.gun1, VHEF_EJECT);
         	entity oldother = other;
         	other = e;
         	instance.phase = 0;
@@ -756,7 +756,7 @@ METHOD(Bumblebee, vr_think, void(Bumblebee thisveh, entity instance))
         if(instance.gunner2)
         {
         	entity e = instance.gunner2;
-        	instance.gun2.vehicle_exit(e, VHEF_EJECT);
+        	instance.gun2.vehicle_exit(instance.gun2, VHEF_EJECT);
         	entity oldother = other;
         	other = e;
         	instance.phase = 0;
@@ -775,10 +775,10 @@ METHOD(Bumblebee, vr_death, void(Bumblebee thisveh, entity instance))
 		instance.gun3.enemy.effects |= EF_NODRAW;
 
 	if(instance.gunner1)
-		instance.gun1.vehicle_exit(instance.gunner1, VHEF_EJECT);
+		instance.gun1.vehicle_exit(instance.gun1, VHEF_EJECT);
 
 	if(instance.gunner2)
-		instance.gun2.vehicle_exit(instance.gunner2, VHEF_EJECT);
+		instance.gun2.vehicle_exit(instance.gun2, VHEF_EJECT);
 
 	instance.vehicle_exit(instance, VHEF_EJECT);