Make vehicles_exit smater (no oldself junk required arroubd it)

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 254f917e6beaf80ba1733d9e491599605f53e2a2..1261e9d188ecc44f5f1e4b1973ea187760f65bf0 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -623,13 +623,7 @@ void PutObserverInServer (void)
        }
 
        if(self.vehicle)
-       {
-           entity oldself;
-           oldself = self;
-           self = self.vehicle;
            vehicles_exit(VHEF_RELESE);
-           self = oldself;
-       }
 
        if(self.flagcarried)
                DropFlag(self.flagcarried, world, world);
@@ -1275,16 +1269,12 @@ void ClientKill_Now()
 {
        if(self.vehicle)
        {
-           entity oldself;
-           oldself = self;
-           self = self.vehicle;
            vehicles_exit(VHEF_RELESE);
-           if(!oldself.killindicator_teamchange)
+           if(!self.killindicator_teamchange)
            {
             self.vehicle_health = -1;
             Damage(self, self, self, 1 , DEATH_KILL, self.origin, '0 0 0');            
            }
-           self = oldself;
        }
        
        remove(self.killindicator);
@@ -1814,13 +1804,7 @@ void ReadyCount();
 void ClientDisconnect (void)
 {
        if(self.vehicle)
-       {
-           entity oldself;
-           oldself = self;
-           self = self.vehicle;
            vehicles_exit(VHEF_RELESE);
-           self = oldself;
-       }
 
        if not(self.flags & FL_CLIENT)
        {
@@ -2650,12 +2634,7 @@ void PlayerUseKey()
 
        if(self.vehicle)
        {
-           dprint("Use cought for vehicle\n");
-           entity oldself;
-           oldself = self;
-           self = self.vehicle;
         vehicles_exit(VHEF_NORMAL);
-        self = oldself;
         return;
        }
        

diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc
index f62925f299b659efdc671b89a7bc28f607477335..fc528add4a0009a4e594f92f53f5f1e3193d854b 100644 (file)
--- a/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@ -263,15 +263,6 @@ 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 e51174b79fa18199d589f110c8520263eb11a5a2..c195332eb2ed02284087f4f2ea0acd715cc8bc63 100644 (file)
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -344,16 +344,7 @@ float raptor_frame()
         self.wait = ftmp;
     }
     */
-    
-    /*
-    if(player.BUTTON_USE && raptor.deadflag == DEAD_NO)
-    {
-        self = raptor;
-        vehicles_exit(VHEF_NORMAL);
-        self = player;
-        return 0;
-    }    
-    */
+
     
     if(raptor.deadflag != DEAD_NO)
     {

diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc
index 1c33e53f3bf7b3d3cc558a3ca8bd45c0e560fe7c..488b6121f36704d76ec9d9caf69a6643d5101422 100644 (file)
--- a/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@ -183,15 +183,6 @@ 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);
 
@@ -418,7 +409,6 @@ void spiderbot_think()
 
 void spiderbot_enter()
 {
-
     self.movetype   = MOVETYPE_WALK;
 
     self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_spiderbot_health);
@@ -429,8 +419,6 @@ void spiderbot_enter()
         setattachment(self.owner.flagcarried, self.tur_head, ""); 
         setorigin(self.owner.flagcarried, '-20 0 120'); 
     }
-       
-
 }
 
 void spiderbot_exit(float eject)

diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index da26423a8d335bc50b6fefa1dc64fa14a211d86d..2062c1726befd18afe0b667ae6ad0ecbd871e0b7 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -573,6 +573,13 @@ vector vehicles_findgoodexit(vector prefer_spot)
 **/
 void vehicles_exit(float eject)
 {      
+    entity oldself;
+    if(self.flags & FL_CLIENT)
+    {
+        oldself = self;
+        self = self.vehicle;
+    }
+    
        self.flags |= FL_NOTARGET;
 
     if (self.owner)
@@ -623,6 +630,9 @@ void vehicles_exit(float eject)
     
     self.vehicle_exit(eject);
     self.owner = world;
+    
+    if(oldself)
+        self = oldself;
 }