From e15ed5c2ab522ab6da87f8068c5d9ff92467a452 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 10 Jan 2013 16:30:17 +0100
Subject: [PATCH] fix CSQC scoreboard sorting by applying the same rules as on
 server

---
 qcsrc/client/scoreboard.qc | 80 ++++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 0bd57d311a..591f4b0dc6 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -129,9 +129,25 @@ void HUD_UpdatePlayerTeams()
 	*/
 }
 
+float HUD_CompareScore(float f, float vl, float vr)
+{
+	if(f & SFL_ZERO_IS_WORST)
+	{
+		if(vl == 0 && vr != 0)
+			return 1;
+		if(vl != 0 && vr == 0)
+			return 0;
+	}
+	if(vl > vr)
+		return IS_INCREASING(f);
+	if(vl < vr)
+		return IS_DECREASING(f);
+	return -1;
+}
+
 float HUD_ComparePlayerScores(entity left, entity right)
 {
-	float vl, vr;
+	float vl, vr, r, i;
 	vl = GetPlayerColor(left.sv_entnum);
 	vr = GetPlayerColor(right.sv_entnum);
 
@@ -154,33 +170,20 @@ float HUD_ComparePlayerScores(entity left, entity right)
 		return false;
 	}
 
-	vl = left.scores[ps_primary];
-	vr = right.scores[ps_primary];
-	if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)
-	{
-		if(vl == 0 && vr != 0)
-			return 1;
-		if(vl != 0 && vr == 0)
-			return 0;
-	}
-	if(vl > vr)
-		return IS_INCREASING(scores_flags[ps_primary]);
-	if(vl < vr)
-		return IS_DECREASING(scores_flags[ps_primary]);
+	r = HUD_CompareScore(left.scores[ps_primary], right.scores[ps_primary], scores_flags[ps_primary]);
+	if (r >= 0)
+		return r;
+
+	r = HUD_CompareScore(left.scores[ps_secondary], right.scores[ps_secondary], scores_flags[ps_secondary]);
+	if (r >= 0)
+		return r;
 
-	vl = left.scores[ps_secondary];
-	vr = right.scores[ps_secondary];
-	if(scores_flags[ps_secondary] & SFL_ZERO_IS_WORST)
+	for(i = 0; i < MAX_SCORE; ++i)
 	{
-		if(vl == 0 && vr != 0)
-			return 1;
-		if(vl != 0 && vr == 0)
-			return 0;
+		r = HUD_CompareScore(left.scores[i], right.scores[i], scores_flags[i]);
+		if (r >= 0)
+			return r;
 	}
-	if(vl > vr)
-		return IS_INCREASING(scores_flags[ps_secondary]);
-	if(vl < vr)
-		return IS_DECREASING(scores_flags[ps_secondary]);
 
 	return false;
 }
@@ -199,26 +202,27 @@ void HUD_UpdatePlayerPos(entity player)
 
 float HUD_CompareTeamScores(entity left, entity right)
 {
-	float vl, vr;
+	float i, r;
 
 	if(left.team == COLOR_SPECTATOR)
 		return 1;
 	if(right.team == COLOR_SPECTATOR)
 		return 0;
 
-	vl = left.teamscores[ts_primary];
-	vr = right.teamscores[ts_primary];
-	if(vl > vr)
-		return IS_INCREASING(teamscores_flags[ts_primary]);
-	if(vl < vr)
-		return IS_DECREASING(teamscores_flags[ts_primary]);
+	r = HUD_CompareScore(left.teamscores[ts_primary], right.teamscores[ts_primary], teamscores_flags[ts_primary]);
+	if (r >= 0)
+		return r;
 
-	vl = left.teamscores[ts_secondary];
-	vr = right.teamscores[ts_secondary];
-	if(vl > vr)
-		return IS_INCREASING(teamscores_flags[ts_secondary]);
-	if(vl < vr)
-		return IS_DECREASING(teamscores_flags[ts_secondary]);
+	r = HUD_CompareScore(left.teamscores[ts_secondary], right.teamscores[ts_secondary], teamscores_flags[ts_secondary]);
+	if (r >= 0)
+		return r;
+
+	for(i = 0; i < MAX_SCORE; ++i)
+	{
+		r = HUD_CompareScore(left.teamscores[i], right.teamscores[i], teamscores_flags[i]);
+		if (r >= 0)
+			return r;
+	}
 
 	return false;
 }
-- 
2.39.2