Merge branch 'master' into Mario/showspecs

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / playerlist.c

diff --git a/qcsrc/menu/xonotic/playerlist.c b/qcsrc/menu/xonotic/playerlist.c
index b3a658e3bd5732850058723633eb3ce8b12259a2..a0f64ca39e424c97a05a83e1064b205fa4a3a65d 100644 (file)
--- a/qcsrc/menu/xonotic/playerlist.c
+++ b/qcsrc/menu/xonotic/playerlist.c
@@ -84,7 +84,7 @@ void XonoticPlayerList_resizeNotify(entity me, vector relOrigin, vector relSize,
        me.realUpperMargin = 0.5 * (1 - me.realFontSize_y);
 
        // this list does 1 char left and right margin
-       me.columnScoreSize = 3 * me.realFontSize_x;
+       me.columnScoreSize = 5 * me.realFontSize_x;
        me.columnNameSize = 1 - 3 * me.realFontSize_x - me.columnScoreSize;
 
        me.columnNameOrigin = me.realFontSize_x;
@@ -109,13 +109,13 @@ void XonoticPlayerList_drawListBoxItem(entity me, float i, vector absSize, float
                rgb = colormapPaletteColor(9, 0);
        else
                rgb = '1 1 1';
-       
+
        s = me.getPlayerList(me, i, PLAYERPARM_NAME);
        score = me.getPlayerList(me, i, PLAYERPARM_SCORE);
 
        if(substring(score, strlen(score) - 10, 10) == ":spectator")
        {
-               score = "-666";
+               score = _("spectator");
        }
        else
        {
@@ -123,6 +123,9 @@ void XonoticPlayerList_drawListBoxItem(entity me, float i, vector absSize, float
                        score = substring(score, 0, t);
                if((t = strstrofs(score, ",", 0)) >= 0)
                        score = substring(score, 0, t);
+
+               if(stof(score) == -666)
+                       score = _("spectator");
        }
 
        s = draw_TextShortenToWidth(s, me.columnNameSize, 1, me.realFontSize);