From 9eebeda5ec4704b0565da6ac603efee277b33dfa Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Fri, 25 Nov 2011 18:08:50 +0200 Subject: [PATCH] Use draw_PreloadPicture for the menu, and repair the last file path problems --- qcsrc/menu/draw.qc | 4 ++-- qcsrc/menu/draw.qh | 2 +- qcsrc/menu/xonotic/campaign.c | 2 +- qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c | 2 +- qcsrc/menu/xonotic/maplist.c | 2 +- qcsrc/menu/xonotic/playermodel.c | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qcsrc/menu/draw.qc b/qcsrc/menu/draw.qc index 0a041940e..7fe4aea3b 100644 --- a/qcsrc/menu/draw.qc +++ b/qcsrc/menu/draw.qc @@ -53,10 +53,10 @@ vector boxToGlobalSize(vector v, vector theScale) return v; } -void draw_PreloadPicture(string pic) +string draw_PreloadPicture(string pic) { pic = draw_UseSkinFor(pic); - precache_pic(pic); + return precache_pic(pic); } void draw_Picture(vector theOrigin, string pic, vector theSize, vector theColor, float theAlpha) diff --git a/qcsrc/menu/draw.qh b/qcsrc/menu/draw.qh index 579f84f28..0f5811713 100644 --- a/qcsrc/menu/draw.qh +++ b/qcsrc/menu/draw.qh @@ -14,7 +14,7 @@ void draw_reset(float cw, float ch, float ox, float oy); void draw_setMousePointer(string pic, vector theSize, vector theOffset); void draw_drawMousePointer(vector where); -void draw_PreloadPicture(string pic); +string draw_PreloadPicture(string pic); void draw_ButtonPicture(vector theOrigin, string pic, vector theSize, vector theColor, float theAlpha); void draw_VertButtonPicture(vector theOrigin, string pic, vector theSize, vector theColor, float theAlpha); void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector theColor, float theAlpha, vector theBorderSize); diff --git a/qcsrc/menu/xonotic/campaign.c b/qcsrc/menu/xonotic/campaign.c index 694ebafc7..72191ac51 100644 --- a/qcsrc/menu/xonotic/campaign.c +++ b/qcsrc/menu/xonotic/campaign.c @@ -275,7 +275,7 @@ void XonoticCampaignList_drawListBoxItem(entity me, float i, vector absSize, flo draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED); s = ftos(p); - if(precache_pic(strcat("maps/", campaign_mapname[i])) == "") + if(draw_PreloadPicture(strcat("/maps/", campaign_mapname[i])) == "") 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); diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c index fb2553e73..063604724 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c @@ -54,7 +54,7 @@ void XonoticMapInfoDialog_loadMapInfo(entity me, float i, entity mlb) me.authorLabel.setText(me.authorLabel, me.currentMapAuthor); me.descriptionLabel.setText(me.descriptionLabel, me.currentMapDescription); me.featuresLabel.setText(me.featuresLabel, me.currentMapFeaturesText); - if(precache_pic(strcat("maps/", currentMapPreviewImage)) == "") + if(draw_PreloadPicture(me.currentMapPreviewImage) == "") me.previewImage.src = "nopreview_map"; else me.previewImage.src = me.currentMapPreviewImage; diff --git a/qcsrc/menu/xonotic/maplist.c b/qcsrc/menu/xonotic/maplist.c index 7cf5f1a41..3e38d59e7 100644 --- a/qcsrc/menu/xonotic/maplist.c +++ b/qcsrc/menu/xonotic/maplist.c @@ -186,7 +186,7 @@ void XonoticMapList_drawListBoxItem(entity me, float i, vector absSize, float is draw_Fill('0 0 0', '1 1 0', SKINCOLOR_MAPLIST_INCLUDEDBG, SKINALPHA_MAPLIST_INCLUDEDBG); s = ftos(p); - if(precache_pic(strcat("maps/", MapInfo_Map_bspname)) == "") + if(draw_PreloadPicture(strcat("/maps/", MapInfo_Map_bspname)) == "") draw_Picture(me.columnPreviewOrigin * eX, "nopreview_map", me.columnPreviewSize * eX + eY, '1 1 1', theAlpha); else draw_Picture(me.columnPreviewOrigin * eX, strcat("/maps/", MapInfo_Map_bspname), me.columnPreviewSize * eX + eY, '1 1 1', theAlpha); diff --git a/qcsrc/menu/xonotic/playermodel.c b/qcsrc/menu/xonotic/playermodel.c index b61a0d4d4..0548e1e8f 100644 --- a/qcsrc/menu/xonotic/playermodel.c +++ b/qcsrc/menu/xonotic/playermodel.c @@ -137,10 +137,10 @@ void XonoticPlayerModelSelector_go(entity me, float d) me.currentModelDescription = strzone(bufstr_get(me.bufModels, BUFMODELS_COUNT*me.idxModels+BUFMODELS_DESC)); // fix the image - if(precache_pic(strcat(me.currentModel, "_", ftos(me.currentSkin))) == "") - me.src = me.currentModelImage; + if(draw_PreloadPicture(me.currentModelImage) == "") + me.src = "nopreview_player"; else - me.src = draw_UseSkinFor("nopreview_player"); + me.src = me.currentModelImage; me.updateAspect(me); } -- 2.39.2