make the "icon" part skinnable; fixtrans the icons

diff --git a/gfx/menu/default/icon_pure1.tga b/gfx/menu/default/icon_pure1.tga
index 183ec93ebcf0bcf14befdfb789e63a81692ba6b2..62980d257acf7c009589f7d256612dd106cf70a8 100644 (file)
Binary files a/gfx/menu/default/icon_pure1.tga and b/gfx/menu/default/icon_pure1.tga differ

diff --git a/gfx/menu/luminos/icon_pure1.tga b/gfx/menu/luminos/icon_pure1.tga
index 183ec93ebcf0bcf14befdfb789e63a81692ba6b2..62980d257acf7c009589f7d256612dd106cf70a8 100644 (file)
Binary files a/gfx/menu/luminos/icon_pure1.tga and b/gfx/menu/luminos/icon_pure1.tga differ

diff --git a/gfx/menu/xaw/icon_pure1.tga b/gfx/menu/xaw/icon_pure1.tga
index 183ec93ebcf0bcf14befdfb789e63a81692ba6b2..62980d257acf7c009589f7d256612dd106cf70a8 100644 (file)
Binary files a/gfx/menu/xaw/icon_pure1.tga and b/gfx/menu/xaw/icon_pure1.tga differ

diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc
index b93ecaa7ce84d5f4cc63dd9099c78e1963b0e3f9..afea3e752fd871c079df07fd8cc013995297894c 100644 (file)
--- a/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@ -222,6 +222,7 @@ SKINBEGIN
        SKINVECTOR(COLOR_SERVERLIST_FAVORITE, '1 1 1');
        SKINFLOAT(ALPHA_SERVERLIST_IMPOSSIBLE, 0.7);
        SKINVECTOR(COLOR_SERVERLIST_IMPOSSIBLE, '0.3 0.3 0.3');
+       SKINSTRING(GFX_SERVERLIST_ICON, "icon");
 
        // item: server info
        SKINVECTOR(COLOR_SERVERINFO_NAME, '1 1 1');

diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c
index 610350c02a32c101ec3b76057078889671d8a239..ce9676f3781dbafaf81d8f267917d4ebcbfdbbfa 100644 (file)
--- a/qcsrc/menu/xonotic/serverlist.c
+++ b/qcsrc/menu/xonotic/serverlist.c
@@ -635,10 +635,10 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
                iconPos_x = (me.columnIconsSize - 2 * iconSize_x) * 0.5;
                iconPos_y = (1 - iconSize_y) * 0.5;
 
-               draw_Picture(iconPos, strcat("icon_pure", ftos(strstrofs(s, ":P0:", 0) >= 0)), iconSize, '1 1 1', 1);
+               draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_pure", ftos(strstrofs(s, ":P0:", 0) >= 0)), iconSize, '1 1 1', 1);
 
                iconPos_x += iconSize_x;
-               draw_Picture(iconPos, strcat("icon_aeslevel", ftos(q)), iconSize, '1 1 1', 1);
+               draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_aeslevel", ftos(q)), iconSize, '1 1 1', 1);
        }
 
        s = ftos(p);