mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Remove fademode check from quitting to menu

Browse source 
This means you're allowed to quit to the menu even if you're faded-out,
because it's weird if you can close the menu but not be able to quit.
This commit is contained in:
Misa 2020-05-07 15:57:20 -07:00 committed by Ethan Lee
parent 82d19145ae
commit c61025c172
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
desktop_version/src/Input.cpp
View file

@ -1971,8 +1971,7 @@ void mapinput()
if (game.menupage == 11 && game.press_action) if (game.menupage == 11 && game.press_action)
{ {
//quit to menu //quit to menu
if (graphics.fademode == 0)
{
//Kill contents of offset render buffer, since we do that for some reason. //Kill contents of offset render buffer, since we do that for some reason.
//This fixes an apparent frame flicker. //This fixes an apparent frame flicker.
FillRect(graphics.tempBuffer, 0x000000); FillRect(graphics.tempBuffer, 0x000000);
@ -1981,7 +1980,6 @@ void mapinput()
map.nexttowercolour(); map.nexttowercolour();
game.fadetomenu = true; game.fadetomenu = true;
game.fadetomenudelay = 15; game.fadetomenudelay = 15;
}
} }
if (game.menupage == 20 && game.press_action) if (game.menupage == 20 && game.press_action)
@ -1992,14 +1990,11 @@ void mapinput()
if (game.menupage == 21 && game.press_action) if (game.menupage == 21 && game.press_action)
{ {
//quit to menu //quit to menu
if (graphics.fademode == 0)
{
game.swnmode = false; game.swnmode = false;
graphics.fademode = 2; graphics.fademode = 2;
music.fadeout(); music.fadeout();
game.fadetolab = true; game.fadetolab = true;
game.fadetolabdelay = 15; game.fadetolabdelay = 15;
}
} }
if (game.menupage < 0) game.menupage = 3; if (game.menupage < 0) game.menupage = 3;