From 130a02dd24f896245ed2da11709a9aea9510ae7a Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Fri, 17 Jul 2009 20:40:22 +0000
Subject: [PATCH] a stupid fix for a stupid bug breaking race

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7231 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/g_world.qc | 10 ++++++++--
 data/qcsrc/server/scores.qc  |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index 35bb2afe0..89959bc9c 100644
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -1724,7 +1724,7 @@ float WinningCondition_Race(float fraglimit)
 	FOR_EACH_PLAYER(p)
 	{
 		++n;
-		if not(p.race_completed)
+		if(p.race_completed)
 			++c;
 	}
 	if(n && (n == c))
@@ -1915,7 +1915,7 @@ void CheckRules_World()
 
 				// 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 @@ void CheckRules_World()
 	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 @@ void CheckRules_World()
 	else
 	{
 		checkrules_status = WinningCondition_Scores(fraglimit, leadlimit);
+		//print("WC_SCORES yields ", ftos(checkrules_status), "\n");
 	}
 
 	if(checkrules_status == WINNING_STARTSUDDENDEATHOVERTIME)
@@ -1981,7 +1984,10 @@ void CheckRules_World()
 			checkrules_status = WINNING_YES;
 
 	if(checkrules_status == WINNING_YES)
+	{
+		//print("WINNING\n");
 		NextLevel();
+	}
 };
 
 float mapvote_nextthink;
diff --git a/data/qcsrc/server/scores.qc b/data/qcsrc/server/scores.qc
index 8fb6ec729..8f89839b8 100644
--- a/data/qcsrc/server/scores.qc
+++ b/data/qcsrc/server/scores.qc
@@ -458,6 +458,7 @@ void WinningConditionHelper()
 			else
 				WinningConditionHelper_topscore = -999999999;
 		}
+		WinningConditionHelper_equality = 0;
 	}
 
 	if(WinningConditionHelper_secondscore == 0)
-- 
2.39.2