From: Jakob MG <jakob_mg@hotmail.com>
Date: Sun, 12 Jun 2011 16:17:40 +0000 (+0200)
Subject: Stop player from dropping flag on vehicle exit
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~21
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=e7cd1558be8daa7e5604715117aa722fd3ecc86d;p=xonotic%2Fxonotic-data.pk3dir.git

Stop player from dropping flag on vehicle exit
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 4e97bfa2c..254f917e6 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2648,6 +2648,17 @@ void PlayerUseKey()
 	if(self.classname != "player")
 		return;
 
+	if(self.vehicle)
+	{
+	    dprint("Use cought for vehicle\n");
+	    entity oldself;
+	    oldself = self;
+	    self = self.vehicle;
+        vehicles_exit(VHEF_NORMAL);
+        self = oldself;
+        return;
+	}
+	
 	// a use key was pressed; call handlers
 	if(ctf_usekey())
 		return;
diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc
index 7fefdeb36..2e705d212 100644
--- a/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@ -263,13 +263,15 @@ float racer_frame()
 
     self = racer;
 
+    /*
     if(player.BUTTON_USE)
     {
         vehicles_exit(VHEF_NORMAL);
         self = player;
         return 0;
     }
-
+    */
+    
     if(racer.deadflag != DEAD_NO)
     {
         self = player;
diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index 7a390e8ff..65ac2c977 100644
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -342,14 +342,16 @@ float raptor_frame()
     }
     */
     
+    /*
     if(player.BUTTON_USE && raptor.deadflag == DEAD_NO)
     {
         self = raptor;
         vehicles_exit(VHEF_NORMAL);
         self = player;
         return 0;
-    }
-
+    }    
+    */
+    
     if(raptor.deadflag != DEAD_NO)
     {
         self = player;
diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc
index 3edf015e0..966001e2d 100644
--- a/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@ -183,12 +183,14 @@ float spiderbot_frame()
     player.BUTTON_CROUCH    = 0;
     player.switchweapon     = 0;
 
+    /*
     if(player.BUTTON_USE)
     {
         vehicles_exit(VHEF_NORMAL);
         self = player;
         return 0;
     }
+    */
 
     crosshair_trace(player);
     //UpdateAuxiliaryXhair(player, trace_endpos, ('1 0 0' * player.vehicle_reload2) + ('0 1 0' * (1 - player.vehicle_reload2)), 2);
diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 0181e92d1..1a2079b9c 100644
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -586,7 +586,7 @@ void vehicles_exit(float eject)
         self.owner.event_damage   = PlayerDamage;
         self.owner.hud            = HUD_NORMAL;
         self.owner.switchweapon   = self.switchweapon;
-        self.owner.BUTTON_USE     = 0;
+        //self.owner.BUTTON_USE     = 0;
     }
 
     if(self.deadflag == DEAD_NO)