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

Merge pull request #758 from InfoTeddy/general-bug-fixes

Browse source 
Allow using Esc in Super Gravitron quit menu
This commit is contained in:
Terry Cavanagh 2021-05-15 08:08:54 +10:30 committed by GitHub
commit 85bd009dce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
desktop_version/src/Input.cpp
View file

@ -2215,13 +2215,16 @@ void mapinput(void)
{ {
game.press_action = true; 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(KEYBOARD_ENTER) || key.isDown(game.controllerButton_map) ) game.press_map = true;
if (key.isDown(27) && !game.mapheld) if (key.isDown(27) && !game.mapheld)
{ {
game.mapheld = true; game.mapheld = true;
if (game.menupage < 9) if (game.menupage < 9
|| (game.menupage >= 20 && game.menupage <= 21))
{ {
game.menupage = 30; game.menupage = 30;
} }