Stop player from dropping flag on vehicle exit

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 4e97bfa2c5394069bb8d4ee17ee8b6f2f29a2a4f..254f917e6beaf80ba1733d9e491599605f53e2a2 100644 (file)
--- 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 7fefdeb366f334b4140ef92d7f703301e1dfabe8..2e705d212ba88291bebab6f1dd0f5df78fa478a0 100644 (file)
--- 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 7a390e8ff3f9647e65ec26ed2da013bfd21dba6b..65ac2c977fe22a3bb4be6fb00178a901e1f94206 100644 (file)
--- 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 3edf015e0ce0028e8998f6f2c6de6c1759c5eef3..966001e2dbcbadf00654c3ec93ebef461d8aafd4 100644 (file)
--- 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 0181e92d1ccde2378f086949860166b32cef5236..1a2079b9cac49321a5e6e7fb1424501f36c7cb60 100644 (file)
--- 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)