From 69be5e7412e21a1e517d86ebda34fa8d422f04a7 Mon Sep 17 00:00:00 2001 From: Severin Meyer Date: Sun, 26 Jul 2015 15:22:54 +0200 Subject: [PATCH] Do not hardcode dirty fix for aliased gametype icons, instead offer a new menu theme variable BOOL_GAMETYPELIST_ICON_BLUR --- gfx/menu/luma/skinvalues.txt | 3 +++ gfx/menu/luminos/skinvalues.txt | 3 +++ gfx/menu/wickedx/skinvalues.txt | 3 +++ gfx/menu/xaw/skinvalues.txt | 3 +++ qcsrc/menu/skin-customizables.inc | 3 +++ qcsrc/menu/xonotic/gametypelist.qc | 8 +++++--- 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/gfx/menu/luma/skinvalues.txt b/gfx/menu/luma/skinvalues.txt index ed335aa14..c997fea25 100644 --- a/gfx/menu/luma/skinvalues.txt +++ b/gfx/menu/luma/skinvalues.txt @@ -126,6 +126,9 @@ HEIGHT_NORMAL 1.45 HEIGHT_TITLE 1.45 HEIGHT_ZOOMEDTITLE -1 +// gametypelist +BOOL_GAMETYPELIST_ICON_BLUR 0 + // inputbox COLOR_INPUTBOX_F '1 1 1' COLOR_INPUTBOX_N '1 1 1' diff --git a/gfx/menu/luminos/skinvalues.txt b/gfx/menu/luminos/skinvalues.txt index d465f13c3..ca0384fb5 100755 --- a/gfx/menu/luminos/skinvalues.txt +++ b/gfx/menu/luminos/skinvalues.txt @@ -196,6 +196,9 @@ COLOR_DIALOG_SCREENSHOTVIEWER '1 1 1' COLOR_DIALOG_CVARS '1 0 0' COLOR_DIALOG_HUDCONFIRM '1 0 0' +// gametypelist +BOOL_GAMETYPELIST_ICON_BLUR 1 + // item: input box // uses "inputbox" images COLOR_INPUTBOX_N '1 1 1' diff --git a/gfx/menu/wickedx/skinvalues.txt b/gfx/menu/wickedx/skinvalues.txt index 09ded4b08..b7011a0b0 100644 --- a/gfx/menu/wickedx/skinvalues.txt +++ b/gfx/menu/wickedx/skinvalues.txt @@ -196,6 +196,9 @@ COLOR_DIALOG_SCREENSHOTVIEWER '1 1 1' COLOR_DIALOG_CVARS '1 0 0' COLOR_DIALOG_HUDCONFIRM '1 0 0' +// gametypelist +BOOL_GAMETYPELIST_ICON_BLUR 1 + // item: input box // uses "inputbox" images COLOR_INPUTBOX_N '1 1 1' diff --git a/gfx/menu/xaw/skinvalues.txt b/gfx/menu/xaw/skinvalues.txt index 00df32498..5f4bbaad4 100644 --- a/gfx/menu/xaw/skinvalues.txt +++ b/gfx/menu/xaw/skinvalues.txt @@ -114,6 +114,9 @@ COLOR_CVARLIST_CHANGED '1 0 0' COLOR_CVARLIST_UNCHANGED '1 1 1' COLOR_CVARLIST_CONTROLS '1 0 0' +// gametypelist +BOOL_GAMETYPELIST_ICON_BLUR 1 + // item: dialog // uses "border" images // uses "closebutton" images diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc index 413f10338..9011b3188 100644 --- a/qcsrc/menu/skin-customizables.inc +++ b/qcsrc/menu/skin-customizables.inc @@ -175,6 +175,9 @@ SKINBEGIN SKINVECTOR(COLOR_CLEARBUTTON_F, '1 1 1'); SKINVECTOR(COLOR_CLEARBUTTON_C, '1 1 1'); + // item: gametype list + SKINFLOAT(BOOL_GAMETYPELIST_ICON_BLUR, 0); + // item: key grabber SKINVECTOR(COLOR_KEYGRABBER_TITLES, '1 1 1'); SKINFLOAT(ALPHA_KEYGRABBER_TITLES, 1); diff --git a/qcsrc/menu/xonotic/gametypelist.qc b/qcsrc/menu/xonotic/gametypelist.qc index 26845f094..030af6715 100644 --- a/qcsrc/menu/xonotic/gametypelist.qc +++ b/qcsrc/menu/xonotic/gametypelist.qc @@ -36,9 +36,11 @@ void XonoticGametypeList_configureXonoticGametypeList(entity me) me.configureXonoticListBox(me); me.nItems = GameType_GetCount(); - // we want the pics mipmapped - for(int i = 0; i < GameType_GetCount(); ++i) - draw_PreloadPictureWithFlags(GameType_GetIcon(i), PRECACHE_PIC_MIPMAP); + if(SKINBOOL_GAMETYPELIST_ICON_BLUR) + { + for(int i = 0; i < GameType_GetCount(); ++i) + draw_PreloadPictureWithFlags(GameType_GetIcon(i), PRECACHE_PIC_MIPMAP); + } me.loadCvars(me); } -- 2.39.2