From: terencehill <piuntn@gmail.com>
Date: Sat, 14 Jan 2012 21:15:20 +0000 (+0100)
Subject: CA: never reset the map in warmup stage
X-Git-Tag: xonotic-v0.6.0~42^2~7^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1e41400447e09dc6d3876bc622658ab66e2b1fbd;p=xonotic%2Fxonotic-data.pk3dir.git

CA: never reset the map in warmup stage
---

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index 6dc7593b2..e1c210a3d 100644
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -382,7 +382,7 @@ void count_alive_players()
  */
 void Spawnqueue_Check()
 {
-	if(warmup == 0 && g_ca)
+	if(warmup == 0 && g_ca && !inWarmupStage)
 	{
 		if(red_players || blue_players)
 			reset_map(TRUE);