r4179 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-25 02:53:58 -0400 (Mon, 25 Aug 2008)
New Revision: 4179

Modified:
   trunk/data/qcsrc/server/g_world.qc
Log:
support fraglimit in qualifying-then-race too


Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-08-25 06:48:03 UTC (rev 4178)
+++ trunk/data/qcsrc/server/g_world.qc	2008-08-25 06:53:58 UTC (rev 4179)
@@ -1528,10 +1528,10 @@
 }
 
 void ReadyRestart();
-float WinningCondition_QualifyingThenRace()
+float WinningCondition_QualifyingThenRace(float limit)
 {
 	float wc;
-	wc = WinningCondition_Scores(0);
+	wc = WinningCondition_Scores(limit);
 
 	// NEVER initiate overtime
 	if(wc == WINNING_YES || wc == WINNING_STARTOVERTIME)
@@ -1711,7 +1711,7 @@
 	}
 	else if(g_race && g_race_qualifying == 2 && timelimit >= 0)
 	{
-		status = WinningCondition_QualifyingThenRace();
+		status = WinningCondition_QualifyingThenRace(fraglimit);
 	}
 	else if(g_assault)
 	{