r4470 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-19 04:22:07 -0400 (Fri, 19 Sep 2008)
New Revision: 4470

Modified:
   trunk/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/scores.qc
Log:
fix winning condiiton..


Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-09-19 07:41:07 UTC (rev 4469)
+++ trunk/data/qcsrc/server/g_world.qc	2008-09-19 08:22:07 UTC (rev 4470)
@@ -1404,9 +1404,6 @@
 	if(WinningConditionHelper_winnerteam >= 0)
 		SetWinners(team, WinningConditionHelper_winnerteam);
 
-	if(WinningConditionHelper_topscore == 0)
-		WinningConditionHelper_equality = 0;
-	
 	if(WinningConditionHelper_lowerisbetter)
 	{
 		WinningConditionHelper_topscore = -WinningConditionHelper_topscore;

Modified: trunk/data/qcsrc/server/scores.qc
===================================================================
--- trunk/data/qcsrc/server/scores.qc	2008-09-19 07:41:07 UTC (rev 4469)
+++ trunk/data/qcsrc/server/scores.qc	2008-09-19 08:22:07 UTC (rev 4470)
@@ -363,14 +363,30 @@
 		WinningConditionHelper_topscore = teamscorekeepers[WinningConditionHelper_winnerteam].teamscores_primary;
 		WinningConditionHelper_lowerisbetter = (teamscores_flags_primary & SFL_LOWER_IS_BETTER);
 		WinningConditionHelper_zeroisworst = (teamscores_flags_primary & SFL_ZERO_IS_WORST);
+
 		if(teamscores_flags_primary & SFL_TIME)
 			WinningConditionHelper_topscore /= 10;
 
+		if(WinningConditionHelper_equality)
+			WinningConditionHelper_winnerteam = -1;
+
 		WinningConditionHelper_winner = world;
 		if(WinningConditionHelper_equality)
 			WinningConditionHelper_winnerteam = -1;
 		else
 			++WinningConditionHelper_winnerteam; // map to Nexuiz team numbers (as opposed to colors)
+
+		if(WinningConditionHelper_topscore == 0)
+		{
+			if(scores_flags_primary & SFL_ZERO_IS_WORST)
+			{
+				if(WinningConditionHelper_lowerisbetter)
+					WinningConditionHelper_topscore = 999999999;
+				else
+					WinningConditionHelper_topscore = -999999999;
+			}
+			WinningConditionHelper_equality = 0;
+		}
 	}
 	else
 	{
@@ -390,20 +406,26 @@
 
 		WinningConditionHelper_topscore = WinningConditionHelper_winner.scorekeeper.scores_primary;
 		WinningConditionHelper_lowerisbetter = (scores_flags_primary & SFL_LOWER_IS_BETTER);
-		if(scores_flags_primary & SFL_ZERO_IS_WORST)
-			if(WinningConditionHelper_topscore == 0)
+		WinningConditionHelper_zeroisworst = (teamscores_flags_primary & SFL_ZERO_IS_WORST);
+
+		if(teamscores_flags_primary & SFL_TIME)
+			WinningConditionHelper_topscore /= 10;
+
+		WinningConditionHelper_winnerteam = -1;
+		if(WinningConditionHelper_equality)
+			WinningConditionHelper_winner = world;
+
+		if(WinningConditionHelper_topscore == 0)
+		{
+			if(scores_flags_primary & SFL_ZERO_IS_WORST)
 			{
 				if(WinningConditionHelper_lowerisbetter)
 					WinningConditionHelper_topscore = 999999999;
 				else
 					WinningConditionHelper_topscore = -999999999;
 			}
-		if(teamscores_flags_primary & SFL_TIME)
-			WinningConditionHelper_topscore /= 10;
-
-		if(WinningConditionHelper_equality)
-			WinningConditionHelper_winner = world;
-		WinningConditionHelper_winnerteam = -1;
+			WinningConditionHelper_equality = 0;
+		}
 	}
 
 	if(worldstatus)