SP_ELO doesn't need a label since it's not a real score (like ping, pl and name)...

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index f914df7dde266da81b331c964f871183c8e9030c..6078d0b4253832731ae18bd0d54d08c08c9ba512 100644 (file)
--- 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 64c94001fbc5bcd9ab42caffd6d8c86604368a32..8262e37673a162efd73629bb4c7fca9cdcd5ea40 100644 (file)
--- 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);