scoreboard: try "&" instead of "and"

[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 9bdd22ca56a24626b9dfd8dddbef7644648ba2be..048e826c0623fd5414b399abc6851ec4fc5385b2 100644 (file)
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -1615,6 +1615,8 @@ void Scoreboard_Draw()
        {
                if(fl > 0)
                {
+                       if(tl > 0)
+                               str = strcat(str, "^7 / "); // delimiter
                        if(teamplay)
                        {
                                str = strcat(str, sprintf(_("^5%s %s"), ScoreString(teamscores_flags(ts_primary), fl),
@@ -1632,13 +1634,11 @@ void Scoreboard_Draw()
                }
                if(ll > 0)
                {
-                       //if(tl > 0 || fl > 0)
-                       //      str = strcat(str, "^7 / "); // delimiter
                        if(tl > 0 || fl > 0)
                        {
                                // delimiter
                                if (ll_and_fl)
-                                       str = strcat(str, "^7 and ");
+                                       str = strcat(str, "^7 & ");
                                else
                                        str = strcat(str, "^7 / ");
                        }