Merge remote-tracking branch 'origin/master' into samual/update_effects_tab

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

diff --git a/qcsrc/menu/xonotic/campaign.c b/qcsrc/menu/xonotic/campaign.c
index 04f7a083c2d32a035ac9bb5d15e6c2e1c127b72e..90b559b01ca4cf2a61cc513c98555ef3ba5e15dd 100644 (file)
--- a/qcsrc/menu/xonotic/campaign.c
+++ b/qcsrc/menu/xonotic/campaign.c
@@ -249,7 +249,6 @@ void XonoticCampaignList_clickListBoxItem(entity me, float i, vector where)
 void XonoticCampaignList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
        string s;
-       float p;
        vector theColor;
        float theAlpha;
        float j, n;
@@ -274,8 +273,11 @@ void XonoticCampaignList_drawListBoxItem(entity me, float i, vector absSize, flo
        if(isSelected)
                draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
 
-       s = ftos(p);
-       draw_Picture(me.columnPreviewOrigin * eX, strcat("/maps/", campaign_mapname[i]), me.columnPreviewSize * eX + eY, '1 1 1', theAlpha);
+       if(draw_PictureSize(strcat("/maps/", campaign_mapname[i])) == '0 0 0')
+               draw_Picture(me.columnPreviewOrigin * eX, "nopreview_map", me.columnPreviewSize * eX + eY, '1 1 1', theAlpha);
+       else
+               draw_Picture(me.columnPreviewOrigin * eX, strcat("/maps/", campaign_mapname[i]), me.columnPreviewSize * eX + eY, '1 1 1', theAlpha);
+
        if(i < me.campaignIndex)
                draw_Picture(me.checkMarkOrigin, "checkmark", me.checkMarkSize, '1 1 1', 1);
        if(i <= me.campaignIndex)