From 464d479e139258446caa20521eb0d42ae322cc73 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 3 Nov 2010 08:11:36 +0100 Subject: [PATCH] make the "icon" part skinnable; fixtrans the icons --- gfx/menu/default/icon_pure1.tga | Bin 4114 -> 4114 bytes gfx/menu/luminos/icon_pure1.tga | Bin 4114 -> 4114 bytes gfx/menu/xaw/icon_pure1.tga | Bin 4114 -> 4114 bytes qcsrc/menu/skin-customizables.inc | 1 + qcsrc/menu/xonotic/serverlist.c | 4 ++-- 5 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gfx/menu/default/icon_pure1.tga b/gfx/menu/default/icon_pure1.tga index 183ec93ebcf0bcf14befdfb789e63a81692ba6b2..62980d257acf7c009589f7d256612dd106cf70a8 100644 GIT binary patch delta 1245 zcmaizO-NKx6vzML*UY?`XJ*W2qfVAs3^N%IB`s(m3Pcoz26U2fDjN`s(oxGIy!#fV zx9G#7C=z)zr5QyQDM8U<7PT1ZV`Gb2)TV`-+Dzv>M;AtPAHR3*Irp6Zx$nRm^N;y! zfjq1%Kj^V!$z99*^$KL>oygL`&BGf;YwP!rF8Z|Ot_g|@N z<9eb}ZZox2k^O&-yk$D#S*x(>%Z+)xu2qk|_~Z3LyiHp1Jh5Kh%)GiIL0T*M(A1;hDdXGRM?nUuN_Ks$x*gCRLs)UVc22@#I&h7fY8 zC|T-B0IG(%@K#(sVaCIlDu>NON+5ulgqM-O%>Al%5{N_)Zr_VJAx~S*7HLVkXhi<9 z1kE=(9YAG52CdEcSE4?7&KfieYJ_lHPFsg)9h6q#9i$RlV_JQcZZgyVxBg=&u6_e;KIZOI}WrIQ+;mv zg?w#m+{JY{EmNwy)c10z?*5NgD? zEE3#nyh*_|8YS&bdcgO$J`3qYyHnS_)%aHZ`WJlLm!BNcyF=_Ho4qdp#x}3fsiznA|BE&XwR&pa*I@y$~ zlpl!?Vou)4Rf?jEO1YW!R)mO;udGpj9C#Xu(BpU|g#UQ!mX6#zAsTMGaH diff --git a/gfx/menu/luminos/icon_pure1.tga b/gfx/menu/luminos/icon_pure1.tga index 183ec93ebcf0bcf14befdfb789e63a81692ba6b2..62980d257acf7c009589f7d256612dd106cf70a8 100644 GIT binary patch delta 1245 zcmaizO-NKx6vzML*UY?`XJ*W2qfVAs3^N%IB`s(m3Pcoz26U2fDjN`s(oxGIy!#fV zx9G#7C=z)zr5QyQDM8U<7PT1ZV`Gb2)TV`-+Dzv>M;AtPAHR3*Irp6Zx$nRm^N;y! zfjq1%Kj^V!$z99*^$KL>oygL`&BGf;YwP!rF8Z|Ot_g|@N z<9eb}ZZox2k^O&-yk$D#S*x(>%Z+)xu2qk|_~Z3LyiHp1Jh5Kh%)GiIL0T*M(A1;hDdXGRM?nUuN_Ks$x*gCRLs)UVc22@#I&h7fY8 zC|T-B0IG(%@K#(sVaCIlDu>NON+5ulgqM-O%>Al%5{N_)Zr_VJAx~S*7HLVkXhi<9 z1kE=(9YAG52CdEcSE4?7&KfieYJ_lHPFsg)9h6q#9i$RlV_JQcZZgyVxBg=&u6_e;KIZOI}WrIQ+;mv zg?w#m+{JY{EmNwy)c10z?*5NgD? zEE3#nyh*_|8YS&bdcgO$J`3qYyHnS_)%aHZ`WJlLm!BNcyF=_Ho4qdp#x}3fsiznA|BE&XwR&pa*I@y$~ zlpl!?Vou)4Rf?jEO1YW!R)mO;udGpj9C#Xu(BpU|g#UQ!mX6#zAsTMGaH diff --git a/gfx/menu/xaw/icon_pure1.tga b/gfx/menu/xaw/icon_pure1.tga index 183ec93ebcf0bcf14befdfb789e63a81692ba6b2..62980d257acf7c009589f7d256612dd106cf70a8 100644 GIT binary patch delta 1245 zcmaizO-NKx6vzML*UY?`XJ*W2qfVAs3^N%IB`s(m3Pcoz26U2fDjN`s(oxGIy!#fV zx9G#7C=z)zr5QyQDM8U<7PT1ZV`Gb2)TV`-+Dzv>M;AtPAHR3*Irp6Zx$nRm^N;y! zfjq1%Kj^V!$z99*^$KL>oygL`&BGf;YwP!rF8Z|Ot_g|@N z<9eb}ZZox2k^O&-yk$D#S*x(>%Z+)xu2qk|_~Z3LyiHp1Jh5Kh%)GiIL0T*M(A1;hDdXGRM?nUuN_Ks$x*gCRLs)UVc22@#I&h7fY8 zC|T-B0IG(%@K#(sVaCIlDu>NON+5ulgqM-O%>Al%5{N_)Zr_VJAx~S*7HLVkXhi<9 z1kE=(9YAG52CdEcSE4?7&KfieYJ_lHPFsg)9h6q#9i$RlV_JQcZZgyVxBg=&u6_e;KIZOI}WrIQ+;mv zg?w#m+{JY{EmNwy)c10z?*5NgD? zEE3#nyh*_|8YS&bdcgO$J`3qYyHnS_)%aHZ`WJlLm!BNcyF=_Ho4qdp#x}3fsiznA|BE&XwR&pa*I@y$~ zlpl!?Vou)4Rf?jEO1YW!R)mO;udGpj9C#Xu(BpU|g#UQ!mX6#zAsTMGaH diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc index b93ecaa7c..afea3e752 100644 --- 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 610350c02..ce9676f37 100644 --- 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); -- 2.39.2