From: terencehill <piuntn@gmail.com>
Date: Sat, 17 Nov 2012 21:59:41 +0000 (+0100)
Subject: Add a few sanity checks
X-Git-Tag: xonotic-v0.7.0~61^2~121
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3074dccba4c43c90d73f61d1cf05b28915a5a802;p=xonotic%2Fxonotic-data.pk3dir.git

Add a few sanity checks
---

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index 3300673f3..ff4a57b6c 100644
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -30,15 +30,24 @@ void reset_map(float dorespawn)
 	entity oldself;
 	oldself = self;
 
-	if(g_arena && 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;
+	if(g_arena)
+	{
+		warmup = max(time, game_starttime);
+		if(autocvar_g_arena_warmup > 0)
+			warmup += autocvar_g_arena_warmup;
+	}
+	else if(g_ca)
+	{
+		warmup = max(time, game_starttime);
+		if(autocvar_g_ca_warmup > 0)
+			warmup += autocvar_g_ca_warmup;
 		allowed_to_spawn = 1;
 	}
 	else if(g_freezetag)
 	{
-		warmup = max(time, game_starttime) + autocvar_g_freezetag_warmup;
+		warmup = max(time, game_starttime);
+		if(autocvar_g_freezetag_warmup > 0)
+			warmup += autocvar_g_freezetag_warmup;
 	}
 
 	lms_lowest_lives = 999;