From: Jakob MG <jakob_mg@hotmail.com>
Date: Thu, 9 Jun 2011 13:42:25 +0000 (+0200)
Subject: Fix vehicle not returning if driver dissconnect
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~32
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=97f519edbb0bc782d224c6f017a8d97233a05a56;p=xonotic%2Fxonotic-data.pk3dir.git

Fix vehicle not returning if driver dissconnect
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 053233b0c..8bffe7783 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1791,7 +1791,7 @@ void ClientDisconnect (void)
 	    entity oldself;
 	    oldself = self;
 	    self = self.vehicle;
-	    self.vehicle_exit(VHEF_RELESE);
+	    vehicles_exit(VHEF_RELESE);
 	    self = oldself;
 	}
 
diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index 505014566..bc2e96160 100644
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -316,29 +316,30 @@ float raptor_frame()
     player = self;
     raptor = self.vehicle;
     self   = raptor;
-    
+        
     /*
     ftmp = vlen(self.velocity);
     if(ftmp > autocvar_g_vehicle_raptor_speed_forward) 
         ftmp = 1;
     else  
         ftmp = ftmp / autocvar_g_vehicle_raptor_speed_forward;
-    */    
+    */
+        
     if(self.sound_nexttime < time)
     {        
         self.sound_nexttime = time + 7.955812; 
-        //dprint("LEN:", ftos(soundlength("vehicles/raptor_fly.wav")), "\n");
-        //sound (self, CHAN_VOICE, "vehicles/raptor_fly.wav", 1 - ftmp,   ATTN_NORM );
-        sound (self, CHAN_TRIGGER, "vehicles/raptor_speed.wav", VOL_VEHICLEENGINE, ATTN_NORM);        
-        //self.wait = ftmp;
-    }    
+        //sound (self.tur_head, CHAN_TRIGGER, "vehicles/raptor_fly.wav", 1 - ftmp,   ATTN_NORM );
+        sound (self, CHAN_TRIGGER, "vehicles/raptor_speed.wav", 1, ATTN_NORM);        
+        self.wait = ftmp;
+    }        
     /*
     else if(fabs(ftmp - self.wait) > 0.2)
     {
-        sound (self, CHAN_VOICE, "", 1 - ftmp,   ATTN_NORM );
-        sound (self, CHAN_PLAYER, "", ftmp, ATTN_NORM);        
+        sound (self.tur_head, CHAN_TRIGGER, "", 1 - ftmp,   ATTN_NORM );
+        sound (self, CHAN_TRIGGER, "", ftmp, ATTN_NORM);        
         self.wait = ftmp;
-    }*/
+    }
+    */
     
     if(player.BUTTON_USE && raptor.deadflag == DEAD_NO)
     {
@@ -728,8 +729,6 @@ void spawnfunc_vehicle_raptor()
 {
     vehicles_configcheck("vehicle_raptor.cfg", autocvar_g_vehicle_raptor_health);
     
-    
-
     if(autocvar_g_vehicle_raptor_shield)
         self.vehicle_flags |= VHF_HASSHIELD;
 
@@ -749,8 +748,10 @@ void spawnfunc_vehicle_raptor()
     precache_model ("models/vehicles/clusterbomb.md3");
     precache_model ("models/vehicles/clusterbomb_folded.md3");
     precache_model ("models/vehicles/raptor_body.dpm");
+    
     precache_sound ("vehicles/raptor_fly.wav");
     precache_sound ("vehicles/raptor_speed.wav");
+    precache_sound ("");
     
     self.think = raptor_dinit;
     self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_raptor_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5);
diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc
index 71b672ed1..255960ae6 100644
--- a/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@ -576,20 +576,19 @@ void spiderbot_die()
     sound (self, CHAN_TRIGGER, "vehicles/spiderbot_die.wav", VOL_BASE, ATTN_NORM);
     pointparticles(particleeffectnum("explosion_medium"), self.origin + '0 0 100', '0 0 0', 1);
 
-    self.health         = 0;
-    self.event_damage   = SUB_Null;
-    self.takedamage     = DAMAGE_NO;
-    self.touch          = SUB_Null;
-    self.cnt            = 3.4 + time + random() * 2;
-    self.think          = spiderbot_blowup;
-    self.nextthink      = time;
-    self.deadflag       = DEAD_DYING;
-	self.frame          = 5;
-	self.tur_head.effects        |= EF_FLAME;
-	self.colormod = self.tur_head.colormod = '-1 -1 -1';
-	self.frame = 10;
-	self.movetype = MOVETYPE_TOSS;
-
+    self.health             = 0;
+    self.event_damage       = SUB_Null;
+    self.takedamage         = DAMAGE_NO;
+    self.touch              = SUB_Null;
+    self.cnt                = 3.4 + time + random() * 2;
+    self.think              = spiderbot_blowup;
+    self.nextthink          = time;
+    self.deadflag           = DEAD_DYING;
+	self.frame              = 5;
+	self.tur_head.effects  |= EF_FLAME;
+	self.colormod           = self.tur_head.colormod = '-1 -1 -1';
+	self.frame              = 10;
+	self.movetype           = MOVETYPE_TOSS;
 }
 
 void vewhicle_spiderbot_dinit()
diff --git a/qcsrc/server/vehicles/vehicles_def.qh b/qcsrc/server/vehicles/vehicles_def.qh
index 9f21eaf7b..ad0e56c6b 100644
--- a/qcsrc/server/vehicles/vehicles_def.qh
+++ b/qcsrc/server/vehicles/vehicles_def.qh
@@ -40,6 +40,7 @@ float VHF_MOVE_FLY      = 512;  /// Vehicle is airborn
 .float  vehicle_respawntime;
 .void() vehicle_spawn;
 
+void vehicles_exit(float eject);
 var .void(float exit_flags) vehicle_exit;
 float VHEF_NORMAL = 0;  /// User pressed exit key
 float VHEF_EJECT  = 1;  /// User pressed exit key 3 times fast (not implemented) or vehile is dying