From: terencehill <piuntn@gmail.com>
Date: Sat, 17 Nov 2012 15:45:25 +0000 (+0100)
Subject: Properly set game start delay in arena too (however arena logic was already good... 
X-Git-Tag: xonotic-v0.7.0~61^2~122
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=705e97d4ff14010d909e8ccad540ad5066e27bd8;p=xonotic%2Fxonotic-data.pk3dir.git

Properly set game start delay in arena too (however arena logic was already good to respect it even if it was bad initialized)
---

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index 691745815..3300673f3 100644
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -31,7 +31,7 @@ void reset_map(float dorespawn)
 	oldself = self;
 
 	if(g_arena && autocvar_g_arena_warmup)
-		warmup = time + autocvar_g_arena_warmup;
+		warmup = max(time, game_starttime) + autocvar_g_arena_warmup;
 	else if(g_ca) {
 		warmup = max(time, game_starttime) + autocvar_g_ca_warmup;
 		allowed_to_spawn = 1;