From: Rudolf Polzer Date: Wed, 3 Nov 2010 07:11:36 +0000 (+0100) Subject: make the "icon" part skinnable; fixtrans the icons X-Git-Tag: xonotic-v0.1.0preview~208 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=464d479e139258446caa20521eb0d42ae322cc73;p=xonotic%2Fxonotic-data.pk3dir.git 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 183ec93eb..62980d257 100644 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 183ec93eb..62980d257 100644 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 183ec93eb..62980d257 100644 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 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);