Revert "- fixed the calculations which decide whether to use an options menu for skills and episodes."

This reverts commit d308a1223b.

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.
This commit is contained in:
Christoph Oelckers 2019-07-17 21:10:29 +02:00
parent 95349822c4
commit 9219834a1a

View file

@ -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 // center the menu on the screen if the top space is larger than the bottom space
int totalheight = posy + AllEpisodes.Size() * ld->mLinespacing - topy; 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; int topdelta = newtop - topy;
if (topdelta < 0) 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 // center the menu on the screen if the top space is larger than the bottom space
int totalheight = posy + MenuSkills.Size() * ld->mLinespacing - topy; 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; int topdelta = newtop - topy;
if (topdelta < 0) if (topdelta < 0)
{ {