mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-22 17:49:43 +01:00
Merge pull request #758 from InfoTeddy/general-bug-fixes
Allow using Esc in Super Gravitron quit menu
This commit is contained in:
commit
85bd009dce
1 changed files with 5 additions and 2 deletions
|
@ -2215,13 +2215,16 @@ void mapinput(void)
|
|||
{
|
||||
game.press_action = true;
|
||||
}
|
||||
if (game.menupage < 12 || (game.menupage >= 30 && game.menupage <= 32))
|
||||
if (game.menupage < 12
|
||||
|| (game.menupage >= 20 && game.menupage <= 21)
|
||||
|| (game.menupage >= 30 && game.menupage <= 32))
|
||||
{
|
||||
if (key.isDown(KEYBOARD_ENTER) || key.isDown(game.controllerButton_map) ) game.press_map = true;
|
||||
if (key.isDown(27) && !game.mapheld)
|
||||
{
|
||||
game.mapheld = true;
|
||||
if (game.menupage < 9)
|
||||
if (game.menupage < 9
|
||||
|| (game.menupage >= 20 && game.menupage <= 21))
|
||||
{
|
||||
game.menupage = 30;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue