r5695 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-29 07:35:17 -0500 (Thu, 29 Jan 2009)
New Revision: 5695

Modified:
   trunk/data/qcsrc/server/g_world.qc
Log:
fix the last commit :P


Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2009-01-29 12:34:12 UTC (rev 5694)
+++ trunk/data/qcsrc/server/g_world.qc	2009-01-29 12:35:17 UTC (rev 5695)
@@ -1760,7 +1760,15 @@
 	}
 
 	if(timelimit > 0)
+	{
 		timelimit += game_starttime;
+	}
+	else if (timelimit < 0)
+	{
+		// endmatch
+		NextLevel();
+		return;
+	}
 
 	if(checkrules_overtimeend)
 	{
@@ -1776,14 +1784,8 @@
 	}
 	else
 	{
-		if (timelimit < 0)
+		if (timelimit && time >= timelimit)
 		{
-			// endmatch
-			NextLevel();
-			return;
-		}
-		else if (timelimit && time >= timelimit)
-		{
 			if(g_race && g_race_qualifying == 2 && timelimit > 0)
 			{
 				float totalplayers;