From 337a07ab75a09ac28406b39e955bca6c5a60b502 Mon Sep 17 00:00:00 2001 From: pogokeen Date: Thu, 22 Mar 2018 07:13:36 +0000 Subject: [PATCH] menus.cpp: disable palette emulation menu options when in Polymost and r_useindexedcolortextures is 1 git-svn-id: https://svn.eduke32.com/eduke32@6787 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/menus.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/duke3d/src/menus.cpp b/source/duke3d/src/menus.cpp index 7809b2f37..f7b911592 100644 --- a/source/duke3d/src/menus.cpp +++ b/source/duke3d/src/menus.cpp @@ -1945,8 +1945,11 @@ static void Menu_Pre(MenuID_t cm) if (getrendermode() != REND_CLASSIC) { //POGOTODO: allow setting anisotropy again while r_useindexedcolortextures is set when support is added down the line - // don't allow setting anisotropy while in POLYMOST and r_useindexedcolortextures is enabled + // don't allow setting anisotropy or changing palette emulation while in POLYMOST and r_useindexedcolortextures is enabled MenuEntry_DisableOnCondition(&ME_DISPLAYSETUP_ANISOTROPY, getrendermode() == REND_POLYMOST && r_useindexedcolortextures); +#ifdef EDUKE32_SIMPLE_MENU + MenuEntry_DisableOnCondition(&ME_DISPLAYSETUP_PALETTEEMULATION, getrendermode() == REND_POLYMOST && r_useindexedcolortextures); +#endif for (i = (int32_t) ARRAY_SIZE(MEOSV_DISPLAYSETUP_ANISOTROPY) - 1; i >= 0; --i) { @@ -1970,6 +1973,8 @@ static void Menu_Pre(MenuID_t cm) MenuEntry_DisableOnCondition(&ME_RENDERERSETUP_DETAILTEX, !usehightile); MenuEntry_DisableOnCondition(&ME_RENDERERSETUP_GLOWTEX, !usehightile); # endif + // don't allow changing palette emulation while in POLYMOST and r_useindexedcolortextures is enabled + MenuEntry_DisableOnCondition(&ME_RENDERERSETUP_PALETTEEMULATION, getrendermode() == REND_POLYMOST && r_useindexedcolortextures); break; #endif