[nexuiz-commits] r7519 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2009-08-25 16:49:47 -0400 (Tue, 25 Aug 2009)
New Revision: 7519

Modified:
   trunk/data/qcsrc/server/sv_main.qc
Log:
g_warmup_limit fix by terencehill + timeout slowmo value restoration correctly


Modified: trunk/data/qcsrc/server/sv_main.qc
===================================================================
--- trunk/data/qcsrc/server/sv_main.qc	2009-08-25 20:20:59 UTC (rev 7518)
+++ trunk/data/qcsrc/server/sv_main.qc	2009-08-25 20:49:47 UTC (rev 7519)
@@ -194,8 +194,10 @@
 	sv_warsowbunny_backtosideratio = cvar("sv_warsowbunny_backtosideratio");
 	teamplay = cvar ("teamplay");
 	sys_ticrate = cvar("sys_ticrate");
-	orig_slowmo = cvar("slowmo");
 
+	if (timeoutStatus == 1) // just before the timeout (when timeoutStatus will be 2)
+		orig_slowmo = cvar("slowmo"); // slowmo will be restored after the timeout
+
 	if(teams_matter && !teamplay)
 		teamplay = 3;
 	if(!teams_matter && teamplay)
@@ -206,9 +208,9 @@
 	Spawnqueue_Check();
 
 	// if in warmup stage and limit for warmup is hit start match
-	if (inWarmupStage
-	    && 0 < g_warmup_limit
-	    && time >= g_warmup_limit)
+	if (inWarmupStage)
+	if ((g_warmup_limit > 0 && time >= g_warmup_limit)
+	 || (g_warmup_limit == 0 && cvar("timelimit") != 0 && time >= cvar("timelimit") * 60))
 	{
 		ReadyRestart();
 		return;