Use draw_PreloadPicture for the menu, and repair the last file path problems

diff --git a/qcsrc/menu/draw.qc b/qcsrc/menu/draw.qc
index 0a041940e2f877406480456de75241c8858b030a..7fe4aea3bdc38e57c99eb976b90326f8658198ca 100644 (file)
--- 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 579f84f284faf9f2dc8c596154046264d814c87c..0f5811713d6f3c1b66f3f38ae2742d3bb2b810ed 100644 (file)
--- 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 694ebafc775c30a5e61bc2b6bf5c9ded9eff7183..72191ac51f5fb34ee2b739dad1b5ba7e8d9f6714 100644 (file)
--- 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 fb2553e7350586b5f528207159ae8c8e938710d1..063604724dd43f280bc2cbf87c40fc0e796a56d0 100644 (file)
--- 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 7cf5f1a41f198f6090bd019e6e84d9d2422bc2bd..3e38d59e77e5b85e907399e496a7c809f36123ce 100644 (file)
--- 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 b61a0d4d41a5e6a065665fefc131f44b9ef30832..0548e1e8fad485d5e3b01c4e89dbf115a140a7cd 100644 (file)
--- 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);
 }