From 9219834a1a62030a697c8205df1d0bab16802976 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 17 Jul 2019 21:10:29 +0200 Subject: [PATCH] Revert "- fixed the calculations which decide whether to use an options menu for skills and episodes." This reverts commit d308a1223b1c6e2bec94d8ba214b96f48fc54b13. This does not work because the menu treats negative coordinates differently. On top of that, changing size of the episode and skill menus dynamically depending on screen size is causing secondary problems so this is better reverted to the previous state. --- src/menu/menudef.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/menu/menudef.cpp b/src/menu/menudef.cpp index 25d138991..15e994a9d 100644 --- a/src/menu/menudef.cpp +++ b/src/menu/menudef.cpp @@ -1123,9 +1123,9 @@ void M_StartupEpisodeMenu(FGameStartup *gs) // center the menu on the screen if the top space is larger than the bottom space int totalheight = posy + AllEpisodes.Size() * ld->mLinespacing - topy; - if (totalheight < CleanHeight-10 || AllEpisodes.Size() == 1) + if (totalheight < 190 || AllEpisodes.Size() == 1) { - int newtop = (CleanHeight - totalheight + topy) / 2; + int newtop = (200 - totalheight + topy) / 2; int topdelta = newtop - topy; if (topdelta < 0) { @@ -1723,9 +1723,9 @@ void M_StartupSkillMenu(FGameStartup *gs) // center the menu on the screen if the top space is larger than the bottom space int totalheight = posy + MenuSkills.Size() * ld->mLinespacing - topy; - if (totalheight < CleanHeight-10 || MenuSkills.Size() == 1) + if (totalheight < 190 || MenuSkills.Size() == 1) { - int newtop = (CleanHeight - totalheight + topy) / 2; + int newtop = (200 - totalheight + topy) / 2; int topdelta = newtop - topy; if (topdelta < 0) {