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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-07-17 16:40:22 -0400 (Fri, 17 Jul 2009)
New Revision: 7231

Modified:
   trunk/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/scores.qc
Log:
a stupid fix for a stupid bug breaking race


Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2009-07-17 18:08:50 UTC (rev 7230)
+++ trunk/data/qcsrc/server/g_world.qc	2009-07-17 20:40:22 UTC (rev 7231)
@@ -1724,7 +1724,7 @@
 	FOR_EACH_PLAYER(p)
 	{
 		++n;
-		if not(p.race_completed)
+		if(p.race_completed)
 			++c;
 	}
 	if(n && (n == c))
@@ -1915,7 +1915,7 @@
 
 				// at least 2 of the players have completed a lap: start the RACE
 				// otherwise, the players should end the qualifying on their own
-				if(readyplayers || playerswithlaps >= 2)
+				if(readyplayers || playerswithlaps >= 1)
 				{
 					checkrules_suddendeathend = 0;
 					ReadyRestart(); // go to race
@@ -1944,10 +1944,12 @@
 	else if(g_race && !g_race_qualifying && timelimit >= 0)
 	{
 		checkrules_status = WinningCondition_Race(fraglimit);
+		//print("WC_RACE yields ", ftos(checkrules_status), "\n");
 	}
 	else if(g_race && g_race_qualifying == 2 && timelimit >= 0)
 	{
 		checkrules_status = WinningCondition_QualifyingThenRace(fraglimit);
+		//print("WC_QUALIFYING_THEN_RACE yields ", ftos(checkrules_status), "\n");
 	}
 	else if(g_assault)
 	{
@@ -1964,6 +1966,7 @@
 	else
 	{
 		checkrules_status = WinningCondition_Scores(fraglimit, leadlimit);
+		//print("WC_SCORES yields ", ftos(checkrules_status), "\n");
 	}
 
 	if(checkrules_status == WINNING_STARTSUDDENDEATHOVERTIME)
@@ -1981,7 +1984,10 @@
 			checkrules_status = WINNING_YES;
 
 	if(checkrules_status == WINNING_YES)
+	{
+		//print("WINNING\n");
 		NextLevel();
+	}
 };
 
 float mapvote_nextthink;

Modified: trunk/data/qcsrc/server/scores.qc
===================================================================
--- trunk/data/qcsrc/server/scores.qc	2009-07-17 18:08:50 UTC (rev 7230)
+++ trunk/data/qcsrc/server/scores.qc	2009-07-17 20:40:22 UTC (rev 7231)
@@ -458,6 +458,7 @@
 			else
 				WinningConditionHelper_topscore = -999999999;
 		}
+		WinningConditionHelper_equality = 0;
 	}
 
 	if(WinningConditionHelper_secondscore == 0)