Attempt to make "no preview" images skin dependent. Works for the client part, but...

diff --git a/gfx/menu/luminos/nopreview_map.tga b/gfx/menu/luminos/nopreview_map.tga
new file mode 100644 (file)
index 0000000..27842cc
Binary files /dev/null and b/gfx/menu/luminos/nopreview_map.tga differ

diff --git a/gfx/menu/luminos/nopreview_player.tga b/gfx/menu/luminos/nopreview_player.tga
new file mode 100644 (file)
index 0000000..393b5ee
Binary files /dev/null and b/gfx/menu/luminos/nopreview_player.tga differ

diff --git a/gfx/nopreview_map.tga b/gfx/nopreview_map.tga
deleted file mode 100644 (file)
index 27842cc..0000000
Binary files a/gfx/nopreview_map.tga and /dev/null differ

diff --git a/gfx/nopreview_player.tga b/gfx/nopreview_player.tga
deleted file mode 100644 (file)
index 393b5ee..0000000
Binary files a/gfx/nopreview_player.tga and /dev/null differ

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 326bae22b5118a7be4a9566ae83dda022167560a..d9f56199b76735fba31403792a17dd5c65eb0976 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -167,6 +167,8 @@ void CSQC_Init(void)
 
        hud_configure_prev = -1;
        tab_panel = -1;
+
+       draw_currentSkin = strzone(strcat("gfx/menu/", cvar_string("menu_skin")));
 }
 
 // CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc)

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 901a3e271e8912b8ef1d91cdec3e2c05b43b85d1..7871f09cef077b4f2eb9261bb3e405f06046fe91 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -91,7 +91,7 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
                if(fexists(strcat(pic, ".jpg")) || fexists(strcat(pic, ".png")) || fexists(strcat(pic, ".tga")))
                        drawpic(pos, pic, img_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
                else
-                       drawpic(pos, "gfx/nopreview_map", img_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
+                       drawpic(pos, draw_UseSkinFor("nopreview_player"), img_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
        }
 
        if(id == mv_ownvote)

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 5ffef8f092052aeb4361799d5d63ed0d34663e3c..aed228455c2e9650fe13b83f9995d37af59f7088 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -39,6 +39,16 @@ void wordwrap_sprint(string s, float l)
 #endif
 #endif
 
+#ifndef SVQC
+string draw_UseSkinFor(string pic)
+{
+       if(substring(pic, 0, 1) == "/")
+               return substring(pic, 1, strlen(pic)-1);
+       else
+               return strcat(draw_currentSkin, "/", pic);
+}
+#endif
+
 string unescape(string in)
 {
        float i, len;

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index b2e77484e398695ea3b2febb290bd217cdf83af5..96ae0040ec8d4bfd34baa88d616ad96d436ec654 100644 (file)
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -20,6 +20,11 @@ void wordwrap_sprint(string s, float l);
 #endif
 void wordwrap_cb(string s, float l, void(string) callback)
 
+#ifndef SVQC
+string draw_currentSkin;
+string draw_UseSkinFor(string pic);
+#endif
+
 float GameCommand_Generic(string cmd);
 // returns TRUE if handled, FALSE otherwise
 // tokenizes its input!

diff --git a/qcsrc/menu/draw.qc b/qcsrc/menu/draw.qc
index 12b56d8dae8f2632ef8bbb84c847a2fde28863dd..0a041940e2f877406480456de75241c8858b030a 100644 (file)
--- a/qcsrc/menu/draw.qc
+++ b/qcsrc/menu/draw.qc
@@ -2,14 +2,6 @@ string draw_mousepointer;
 vector draw_mousepointer_offset;
 vector draw_mousepointer_size;
 
-string draw_UseSkinFor(string pic)
-{
-       if(substring(pic, 0, 1) == "/")
-               return substring(pic, 1, strlen(pic)-1);
-       else
-               return strcat(draw_currentSkin, "/", pic);
-}
-
 void draw_setMousePointer(string pic, vector theSize, vector theOffset)
 {
        draw_mousepointer = strzone(draw_UseSkinFor(pic));

diff --git a/qcsrc/menu/draw.qh b/qcsrc/menu/draw.qh
index 63e22bd6357d85cea28f20cc99c825be20e7b795..579f84f284faf9f2dc8c596154046264d814c87c 100644 (file)
--- a/qcsrc/menu/draw.qh
+++ b/qcsrc/menu/draw.qh
@@ -38,7 +38,5 @@ vector globalToBoxSize(vector v, vector scale);
 
 float draw_NeedResizeNotify;
 
-string draw_currentSkin;
-
 float draw_TextWidth_WithColors(string s, vector size);
 float draw_TextWidth_WithoutColors(string s, vector size);

diff --git a/qcsrc/menu/xonotic/campaign.c b/qcsrc/menu/xonotic/campaign.c
index 75df2abe9ff4a859a27f7048a2833ee156caae02..83b93ffef7c3d767e392fa64b0ece5ed0ceb337e 100644 (file)
--- 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, "/gfx/nopreview_map", me.columnPreviewSize * eX + eY, '1 1 1', theAlpha);
+               draw_Picture(me.columnPreviewOrigin * eX, draw_UseSkinFor("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 ec1e61520b89b9dcc144d344c4d670e0af5b04fa..10eb23f114c5c5bd90111ab17b485556df6c0622 100644 (file)
--- 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 = "/gfx/nopreview_map";
+               me.previewImage.src = draw_UseSkinFor("nopreview_player");
 
        for(i = 0; i < GameType_GetCount(); ++i)
        {

diff --git a/qcsrc/menu/xonotic/maplist.c b/qcsrc/menu/xonotic/maplist.c
index f55a200006d7b0e48370bfbaa1ef18d8956a4ed0..b6772e43eaa37abb5781fb4578688ab9f190aa01 100644 (file)
--- 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, "/gfx/nopreview_map", me.columnPreviewSize * eX + eY, '1 1 1', theAlpha);
+               draw_Picture(me.columnPreviewOrigin * eX, draw_UseSkinFor("nopreview_map"), me.columnPreviewSize * eX + eY, '1 1 1', theAlpha);
 
        if(included)
                draw_Picture(me.checkMarkOrigin, "checkmark", me.checkMarkSize, '1 1 1', 1);

diff --git a/qcsrc/menu/xonotic/playermodel.c b/qcsrc/menu/xonotic/playermodel.c
index 9fc836cc5640d8f912efc615765995fa38fe746f..a296986683fac276095bce2d51a7d109010dffa2 100644 (file)
--- a/qcsrc/menu/xonotic/playermodel.c
+++ b/qcsrc/menu/xonotic/playermodel.c
@@ -140,7 +140,7 @@ void XonoticPlayerModelSelector_go(entity me, float d)
        if(fexists(strcat(me.currentModel, "_", ftos(me.currentSkin), ".jpg")) || fexists(strcat(me.currentModel, "_", ftos(me.currentSkin), ".png")) || fexists(strcat(me.currentModel, "_", ftos(me.currentSkin), ".tga")))
                me.src = me.currentModelImage;
        else
-               me.src = "/gfx/nopreview_player";
+               me.src = draw_UseSkinFor("nopreview_player");
        me.updateAspect(me);
 }