From 949787f11ab273895372cda3635356006e4afb58 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Fri, 25 Nov 2011 17:44:15 +0200 Subject: [PATCH] Fix the image path issue. Images will now show properly --- qcsrc/menu/xonotic/campaign.c | 2 +- qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c | 2 +- qcsrc/menu/xonotic/maplist.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/menu/xonotic/campaign.c b/qcsrc/menu/xonotic/campaign.c index 83b93ffef..c7679494c 100644 --- a/qcsrc/menu/xonotic/campaign.c +++ b/qcsrc/menu/xonotic/campaign.c @@ -278,7 +278,7 @@ void XonoticCampaignList_drawListBoxItem(entity me, float i, vector absSize, flo if(fexists(strcat("maps/", campaign_mapname[i], ".jpg")) || fexists(strcat("maps/", campaign_mapname[i], ".png")) || fexists(strcat("maps/", campaign_mapname[i], ".tga"))) draw_Picture(me.columnPreviewOrigin * eX, strcat("/maps/", campaign_mapname[i]), me.columnPreviewSize * eX + eY, '1 1 1', theAlpha); else - draw_Picture(me.columnPreviewOrigin * eX, draw_UseSkinFor("nopreview_map"), me.columnPreviewSize * eX + eY, '1 1 1', theAlpha); + draw_Picture(me.columnPreviewOrigin * eX, "nopreview_map", me.columnPreviewSize * eX + eY, '1 1 1', theAlpha); if(i < me.campaignIndex) draw_Picture(me.checkMarkOrigin, "checkmark", me.checkMarkSize, '1 1 1', 1); diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c index 10eb23f11..63351282a 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c @@ -57,7 +57,7 @@ void XonoticMapInfoDialog_loadMapInfo(entity me, float i, entity mlb) if(fexists(strcat("maps/", me.currentMapPreviewImage, ".jpg")) || fexists(strcat("maps/", me.currentMapPreviewImage, ".png")) || fexists(strcat("maps/", me.currentMapPreviewImage, ".tga"))) me.previewImage.src = me.currentMapPreviewImage; else - me.previewImage.src = draw_UseSkinFor("nopreview_player"); + me.previewImage.src = "nopreview_map"; for(i = 0; i < GameType_GetCount(); ++i) { diff --git a/qcsrc/menu/xonotic/maplist.c b/qcsrc/menu/xonotic/maplist.c index b6772e43e..c580f66c9 100644 --- a/qcsrc/menu/xonotic/maplist.c +++ b/qcsrc/menu/xonotic/maplist.c @@ -189,7 +189,7 @@ void XonoticMapList_drawListBoxItem(entity me, float i, vector absSize, float is if(fexists(strcat("maps/", MapInfo_Map_bspname, ".jpg")) || fexists(strcat("maps/", MapInfo_Map_bspname, ".png")) || fexists(strcat("maps/", MapInfo_Map_bspname, ".tga"))) draw_Picture(me.columnPreviewOrigin * eX, strcat("/maps/", MapInfo_Map_bspname), me.columnPreviewSize * eX + eY, '1 1 1', theAlpha); else - draw_Picture(me.columnPreviewOrigin * eX, draw_UseSkinFor("nopreview_map"), me.columnPreviewSize * eX + eY, '1 1 1', theAlpha); + draw_Picture(me.columnPreviewOrigin * eX, "nopreview_map", me.columnPreviewSize * eX + eY, '1 1 1', theAlpha); if(included) draw_Picture(me.checkMarkOrigin, "checkmark", me.checkMarkSize, '1 1 1', 1); -- 2.39.2