Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes

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

diff --git a/qcsrc/menu/xonotic/maplist.c b/qcsrc/menu/xonotic/maplist.c
index 14bf48ec9edf0f00282075f5549ce40f3456587b..c37481b9763763ea066f942639a01604a7f0e050 100644 (file)
--- a/qcsrc/menu/xonotic/maplist.c
+++ b/qcsrc/menu/xonotic/maplist.c
@@ -167,7 +167,6 @@ void XonoticMapList_drawListBoxItem(entity me, float i, vector absSize, float is
 {
        // layout: Ping, Map name, Map name, NP, TP, MP
        string s;
-       float p;
        float theAlpha;
        float included;
 
@@ -185,7 +184,6 @@ void XonoticMapList_drawListBoxItem(entity me, float i, vector absSize, float is
        else if(included)
                draw_Fill('0 0 0', '1 1 0', SKINCOLOR_MAPLIST_INCLUDEDBG, SKINALPHA_MAPLIST_INCLUDEDBG);
 
-       s = ftos(p);
        if(draw_PictureSize(strcat("/maps/", MapInfo_Map_bspname)) == '0 0 0')
                draw_Picture(me.columnPreviewOrigin * eX, "nopreview_map", me.columnPreviewSize * eX + eY, '1 1 1', theAlpha);
        else
@@ -193,9 +191,9 @@ void XonoticMapList_drawListBoxItem(entity me, float i, vector absSize, float is
 
        if(included)
                draw_Picture(me.checkMarkOrigin, "checkmark", me.checkMarkSize, '1 1 1', 1);
-       s = draw_TextShortenToWidth(MapInfo_Map_titlestring, me.columnNameSize, 0, me.realFontSize);
+       s = draw_TextShortenToWidth(strdecolorize(MapInfo_Map_titlestring), me.columnNameSize, 0, me.realFontSize);
        draw_Text(me.realUpperMargin1 * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, SKINCOLOR_MAPLIST_TITLE, theAlpha, 0);
-       s = draw_TextShortenToWidth(MapInfo_Map_author, me.columnNameSize, 0,  me.realFontSize);
+       s = draw_TextShortenToWidth(strdecolorize(MapInfo_Map_author), me.columnNameSize, 0,  me.realFontSize);
        draw_Text(me.realUpperMargin2 * eY + (me.columnNameOrigin + 1.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, SKINCOLOR_MAPLIST_AUTHOR, theAlpha, 0);
 
        MapInfo_ClearTemps();