Support g_vehicles_delayspawn (makes vehciles spawn after their set respawntime at...

diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc
index 2d74316af5028ee3ed29d75c66578b25bd288539..34302074d8172fa0a158bc3c8d0639eaac8dc3de 100644 (file)
--- a/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@ -732,7 +732,7 @@ void spawnfunc_vehicle_racer()
         self.vehicle_flags |= VHF_HEALTHREGEN;
 
     self.think = racer_dinit;
-    self.nextthink = time + 1;
+    self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_racer_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5);
 }
 
 #endif // SVQC

diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index c700050ca5f98017a4642cad46f0517c438138fb..7188328ff6949a08e84392e261d17d7e53126e55 100644 (file)
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -795,7 +795,7 @@ void spawnfunc_vehicle_raptor()
     precache_sound ("vehicles/raptor_speed.wav");
     
     self.think = raptor_dinit;
-    self.nextthink = time + 1;
+    self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_raptor_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5);
 }
 #endif // SVQC
 

diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc
index f7910f7c78de7de3ce90ef0cfbcac75140133318..693749c9b272f9d9029d29e325b95a718a6791c6 100644 (file)
--- a/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@ -681,9 +681,9 @@ void spawnfunc_vehicle_spiderbot()
 
     if(autocvar_g_vehicle_spiderbot_health_regen)
         self.vehicle_flags |= VHF_HEALTHREGEN;
-
-    self.think = vewhicle_spiderbot_dinit;
-    self.nextthink = time + 0.5;
+    
+    self.think = vewhicle_spiderbot_dinit;    
+    self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_spiderbot_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5);
 }
 #endif // SVQC
 

diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index ffac64b9c2b5d8ceaa5323a7787ece270eb92f8a..5c7f4e59309d94fd220be39dc003f7aefbde7c52 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -1,6 +1,7 @@
 float autocvar_g_vehicles_crush_dmg;
 float autocvar_g_vehicles_crush_force;
 float autocvar_g_vehicles_delayspawn;
+float autocvar_g_vehicles_delayspawn_jitter;
 
 void vehicles_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force);
 void vehicles_return();
@@ -836,13 +837,8 @@ float vehicle_initialize(string  net_name,
     self.PlayerPhysplug      = physproc;
     self.event_damage        = vehicles_damage;
     self.touch               = vehicles_touch;
-    self.think               = vehicles_spawn;
-    
-    if(autocvar_g_vehicles_delayspawn)
-        self.nextthink           = time + _respawntime;
-    else
-        self.nextthink           = time;
-        
+    self.think               = vehicles_spawn;    
+    self.nextthink           = time;        
     self.vehicle_respawntime = _respawntime;
     self.vehicle_spawn       = spawnproc;
 

diff --git a/vehicles.cfg b/vehicles.cfg
index 3dca4bd70617cd6c8abe4a7efc0d813ffca63e40..4d06429284928295a454d4fd2868bfa0c3ce2218 100644 (file)
--- a/vehicles.cfg
+++ b/vehicles.cfg
@@ -15,3 +15,4 @@ set g_vehicles_crush_force 50
 set cl_vehicles_hudscale 0.5
 
 set g_vehicles_delayspawn 0
+set g_vehicles_delayspawn_jitter 10