From: Samual Lenks <samual@xonotic.org>
Date: Tue, 21 Jan 2014 19:00:09 +0000 (-0500)
Subject: Fix ordering of readyrestart with warmup and add gameover check
X-Git-Tag: xonotic-v0.8.0~235
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e8db49653fa21bf88c253145f80b66dfc7a1d277;p=xonotic%2Fxonotic-data.pk3dir.git

Fix ordering of readyrestart with warmup and add gameover check
---

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 86f2e80fb..920f738ae 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -220,18 +220,19 @@ void StartFrame (void)
 
 	game_delay_last = game_delay;
 
+	CreatureFrame ();
+	CheckRules_World ();
+
 	// if in warmup stage and limit for warmup is hit start match
-	if (warmup_stage)
-	if ((g_warmup_limit > 0 && time >= g_warmup_limit)
+	if(warmup_stage)
+	if(!gameover)
+	if((g_warmup_limit > 0 && time >= g_warmup_limit)
 	 || (g_warmup_limit == 0 && autocvar_timelimit != 0 && time >= autocvar_timelimit * 60))
 	{
 		ReadyRestart();
 		return;
 	}
 
-	CreatureFrame ();
-	CheckRules_World ();
-
 	bot_serverframe();
 
 	FOR_EACH_PLAYER(self)