From: Samual Lenks <samual@xonotic.org>
Date: Thu, 30 Aug 2012 17:43:43 +0000 (-0400)
Subject: TODO some stuff
X-Git-Tag: xonotic-v0.7.0~240^2~73
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=90ff890ebb6421e637ad475be6df1e057d19545e;p=xonotic%2Fxonotic-data.pk3dir.git

TODO some stuff
---

diff --git a/qcsrc/server/vehicles/bumblebee.qc b/qcsrc/server/vehicles/bumblebee.qc
index 0f984129f..a445f12ce 100644
--- a/qcsrc/server/vehicles/bumblebee.qc
+++ b/qcsrc/server/vehicles/bumblebee.qc
@@ -242,12 +242,7 @@ void bumb_gunner_exit(float _exitflag)
 	self.hud            = HUD_NORMAL;
 	self.switchweapon   = self.vehicle.switchweapon;
 
-	if(self.flagcarried)
-	{
-		self.flagcarried.scale = 0.6;
-		setattachment(self.flagcarried, self, "");
-		setorigin(self.flagcarried, FLAG_CARRY_POS);
-	}
+	// FIXCTF TODO 
 
 	self.vehicle.vehicle_hudmodel.viewmodelforclient = self.vehicle;
 
@@ -331,17 +326,7 @@ float bumb_gunner_enter()
 
 	CSQCVehicleSetup(other, other.hud);
 	
-    if(other.flagcarried)
-    {
-        if(!autocvar_g_vehicles_allow_flagcarry)
-            DropFlag(other.flagcarried, world, world);
-        else
-        {
-            other.flagcarried.scale = 1;
-            setattachment(other.flagcarried, self, "");
-            setorigin(other.flagcarried, '0 0 1' * self.maxs_z);
-        }
-    }
+    // FIXCTF TODO
 
 	return TRUE;
 }
diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 87ceecc0c..4364b54fa 100644
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -783,13 +783,6 @@ void vehicles_exit(float eject)
         _player.hud            = HUD_NORMAL;
         _player.switchweapon   = _vehicle.switchweapon;
 
-        if(_player.flagcarried)
-        {
-            _player.flagcarried.scale = 0.6;
-            setattachment(_player.flagcarried, _player, "");
-            setorigin(_player.flagcarried, FLAG_CARRY_POS);
-        }
-
         CSQCVehicleSetup(_player, HUD_NORMAL);
     }
     _vehicle.flags |= FL_NOTARGET;
@@ -806,6 +799,14 @@ void vehicles_exit(float eject)
     self.team = self.tur_head.team;
    
     MUTATOR_CALLHOOK(VehicleExit);
+
+    _vehicle.team = _vehicle.tur_head.team;
+        
+    sound (_vehicle, CH_TRIGGER_SINGLE, "misc/null.wav", 1, ATTN_NORM);
+    _vehicle.vehicle_hudmodel.viewmodelforclient = _vehicle;	
+    _vehicle.phase = time + 1;
+    
+    _vehicle.vehicle_exit(eject);
     
     vehicles_setreturn();
     vehicles_reset_colors();