Fix #2575 "FPS field no longer displayed in scoreboard with sv_showfps set"

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / scoreboard.qc

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index 39deff0d1c36e202696428237d93589679eb4195..58a1093b9511a35a4e41a82d246f3d878739993f 100644 (file)
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -463,9 +463,9 @@ void Cmd_Scoreboard_SetFields(int argc)
                                continue;
                }
 
+               str = strtolower(str);
                strcpy(sbt_field_title[sbt_num_fields], TranslateScoresLabel(str));
                sbt_field_size[sbt_num_fields] = stringwidth(sbt_field_title[sbt_num_fields], false, hud_fontsize);
-               str = strtolower(str);
 
                PlayerScoreField j;
                switch(str)
@@ -479,7 +479,6 @@ void Cmd_Scoreboard_SetFields(int argc)
                        case "elo": sbt_field[sbt_num_fields] = SP_ELO; break;
                        case "dmg": case "damage": sbt_field[sbt_num_fields] = SP_DMG; break;
                        case "dmgtaken": case "damagetaken": sbt_field[sbt_num_fields] = SP_DMGTAKEN; break;
-                       case "fps": sbt_field[sbt_num_fields] = SP_FPS; break;
                        default:
                        {
                                FOREACH(Scores, true, {
@@ -494,8 +493,12 @@ LABEL(notfound)
                                        j = SP_FRAGS;
                                else
                                {
-                                       if(!nocomplain)
+                                       // NOTE: can't check STAT(SHOWFPS) here, if checked too early it returns false anyway
+                                       if(!nocomplain && str != "fps") // server can disable the fps field
                                                LOG_INFOF("^1Error:^7 Unknown score field: '%s'", str);
+
+                                       strfree(sbt_field_title[sbt_num_fields]);
+                                       sbt_field_size[sbt_num_fields] = 0;
                                        continue;
                                }
 LABEL(found)