From: terencehill <piuntn@gmail.com>
Date: Thu, 20 Jun 2013 22:38:10 +0000 (+0200)
Subject: Spawn vehicles according to g_start_delay and make work better g_vehicles_delayspawn_... 
X-Git-Tag: xonotic-v0.8.0~243^2^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4503498a488e1890bb34f15cb3d211401d56a521;p=xonotic%2Fxonotic-data.pk3dir.git

Spawn vehicles according to g_start_delay and make work better g_vehicles_delayspawn_jitter (jitter 10 is now a random number in the interval [-5,+5] instead of [0,+10])
---

diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 1e78bd5a2..172f85000 100644
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -1273,15 +1273,14 @@ float vehicle_initialize(string  net_name,
     self.event_damage        = func_null;
     self.touch               = vehicles_touch;
     self.think               = vehicles_spawn;
-    self.nextthink           = time;
     self.vehicle_respawntime = _respawntime;
     self.vehicle_spawn       = spawnproc;
     self.effects             = EF_NODRAW;
 	self.dphitcontentsmask	 = DPCONTENTS_BODY | DPCONTENTS_SOLID;
-    if(!autocvar_g_vehicles_delayspawn)
-        self.nextthink = time + game_starttime;
-    else
-        self.nextthink = time + _respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter);
+	if(!autocvar_g_vehicles_delayspawn)
+		self.nextthink = time;
+	else
+		self.nextthink = max(time, game_starttime) + _respawntime + ((random() * 2 - 1) * autocvar_g_vehicles_delayspawn_jitter);
 
 	if(autocvar_g_playerclip_collisions)
 		self.dphitcontentsmask |= DPCONTENTS_PLAYERCLIP;