diff --git a/source/duke3d/src/menus.cpp b/source/duke3d/src/menus.cpp index a4b12d021435117b375a045c94263e480feac279..06d68a5cc22339d7f252c91edd81d6ebfe7dcc3d 100644 --- a/source/duke3d/src/menus.cpp +++ b/source/duke3d/src/menus.cpp @@ -259,7 +259,7 @@ static MenuEntryFormat_t MEF_CenterMenu = { 7<<16, 0, 0 }; static MenuEntryFormat_t MEF_BigOptions_Apply = { 4<<16, 16<<16, -(260<<16) }; static MenuEntryFormat_t MEF_BigOptionsRt = { 4<<16, 0, -(260<<16) }; static MenuEntryFormat_t MEF_BigOptionsRtSections = { 3<<16, 0, -(260<<16) }; -#if !defined EDUKE32_STANDALONE && defined USE_OPENGL && !defined EDUKE32_ANDROID_MENU +#ifndef EDUKE32_RETAIL_MENU static MenuEntryFormat_t MEF_SmallOptions = { 1<<16, 0, -(260<<16) }; #endif static MenuEntryFormat_t MEF_BigCheats = { 3<<16, 0, -(260<<16) }; @@ -2431,8 +2431,10 @@ static void Menu_Pre(MenuID_t cm) MEO_SCREENSETUP_SCREENSIZE.max = MEO_SCREENSETUP_SCREENSIZE.steps - 1; if (MEO_SCREENSETUP_SCREENSIZE.steps <= 2 && !(ud.statusbarflags & STATUSBAR_NONONE)) { +#if !defined EDUKE32_STANDALONE && defined USE_OPENGL ME_SCREENSETUP_SCREENSIZE.entry = &MEO_SCREENSETUP_SCREENSIZE_TWO; ME_SCREENSETUP_SCREENSIZE.type = Option; +#endif } else { @@ -2474,12 +2476,13 @@ static void Menu_Pre(MenuID_t cm) #endif #endif } - +#ifdef USE_OPENGL MenuEntry_HideOnCondition(&ME_RENDERERSETUP_TEXQUALITY, !usehightile); MenuEntry_HideOnCondition(&ME_RENDERERSETUP_PRECACHE, !usehightile); # ifndef EDUKE32_GLES MenuEntry_HideOnCondition(&ME_RENDERERSETUP_TEXCACHE, !(glusetexcompr && usehightile)); # endif +#endif //# ifdef USE_GLEXT // MenuEntry_HideOnCondition(&ME_RENDERERSETUP_DETAILTEX, !usehightile); // MenuEntry_HideOnCondition(&ME_RENDERERSETUP_GLOWTEX, !usehightile); @@ -2758,7 +2761,7 @@ static void msaveloadtext(const vec2_t& origin, int level, int volume, int skill auto name = g_mapInfo[(volume * MAXLEVELS) + level].name; auto vname = g_volumeNames[volume]; - + Menu_BlackRectangle(origin.x + ((xoffset-2)<<16), origin.y + ((yoffset-2)<<16), 178<<16, (34-((!!FURY)<<1))<<16, 1); if (vname) @@ -2782,7 +2785,7 @@ static void msaveloadtext(const vec2_t& origin, int level, int volume, int skill mminitext(origin.x + (xoffset2 << 16), origin.y + (yoffset << 16), localeLookup(name), MF_Minifont.pal_selected_right); yoffset += 8; } - + mminitext(origin.x + (xoffset << 16), origin.y + (yoffset << 16), "Difficulty:", MF_Minifont.pal_deselected_right); mminitext(origin.x + (xoffset2 << 16), origin.y + (yoffset << 16), localeLookup(g_skillNames[skill-1]), MF_Minifont.pal_selected_right); yoffset += 8;