From: terencehill <piuntn@gmail.com>
Date: Tue, 13 Mar 2018 18:52:36 +0000 (+0100)
Subject: SP_ELO doesn't need a label since it's not a real score (like ping, pl and name)... 
X-Git-Tag: xonotic-v0.8.5~2234
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e6095e96e132fd011209645a083fe2e9a1df1c18;p=xonotic%2Fxonotic-data.pk3dir.git

SP_ELO doesn't need a label since it's not a real score (like ping, pl and name). Probably it was also needlessly reported to XonStats
---

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index f914df7dd..6078d0b42 100644
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -406,8 +406,7 @@ void Cmd_Scoreboard_SetFields(int argc)
 			argc = tokenizebyseparator(strcat("0 1 ", SCOREBOARD_DEFAULT_COLUMNS), " ");
 		else if(argv(2) == "all")
 		{
-			string s;
-			s = "ping pl name |";
+			string s = "ping pl elo name |"; // scores without a label
 			FOREACH(Scores, true, {
 				if(it != ps_primary)
 				if(it != ps_secondary)
@@ -428,10 +427,8 @@ void Cmd_Scoreboard_SetFields(int argc)
 
 	for(i = 1; i < argc - 1; ++i)
 	{
-		float nocomplain;
 		str = argv(i+1);
-
-		nocomplain = false;
+		bool nocomplain = false;
 		if(substring(str, 0, 1) == "?")
 		{
 			nocomplain = true;
diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc
index 64c94001f..8262e3767 100644
--- a/qcsrc/server/scores_rules.qc
+++ b/qcsrc/server/scores_rules.qc
@@ -54,7 +54,6 @@ void ScoreRules_basics(int teams, float sprio, float stprio, float score_enabled
 
 	ScoreInfo_SetLabel_PlayerScore(SP_DMG, "dmg", 0);
 	ScoreInfo_SetLabel_PlayerScore(SP_DMGTAKEN, "dmgtaken", SFL_LOWER_IS_BETTER);
-	ScoreInfo_SetLabel_PlayerScore(SP_ELO, "elo", 0);
 
 	if(STAT(SHOWFPS))
 		ScoreInfo_SetLabel_PlayerScore(SP_FPS, "fps", 0);