Do not hardcode dirty fix for aliased gametype icons, instead offer a new menu theme...

diff --git a/gfx/menu/luma/skinvalues.txt b/gfx/menu/luma/skinvalues.txt
index ed335aa1497156725ac413a9466389917556f0a4..c997fea25772cd797dc361c60304db04e7cc3b5b 100644 (file)
--- 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 d465f13c3661bc36bcc173160328d2390c9bebfe..ca0384fb554135f88ed4bf13a41c3b3e849497f9 100755 (executable)
--- 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 09ded4b087c356d741a823ab25293da71bae7dcb..b7011a0b0e18369246a573e86f52dd0d22174bb4 100644 (file)
--- 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 00df32498ebdfdb623c9e42d3c9c0348db648a94..5f4bbaad40211135e157b03f89e82e99ef337475 100644 (file)
--- 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 413f10338c48b6be12de19ffc75bf3386316dd09..9011b318830e78a6ebde5d4b5b3106824a0f69c6 100644 (file)
--- 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 26845f0946430469120b374d59bfc0f0d785f7a3..030af6715339257b23ddb7d4a07531f1a489635c 100644 (file)
--- 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);
 }