mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-11 03:19:46 +01:00
Code Issues Releases Wiki Activity

Use game.inspecial() in mapmenuactionpress()

Browse source 
Apart from covering more cases with the SHIP option, it also makes the
if-guard for case 3 much less noisy on the eyes.
This commit is contained in:
Misa 2020-06-22 15:37:19 -07:00 committed by Ethan Lee
parent 949e99c950
commit 4274843a4b
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
desktop_version/src/Input.cpp
View file

@ -1999,7 +1999,7 @@ void mapmenuactionpress()
switch (game.menupage) switch (game.menupage)
{ {
case 1: case 1:
if (obj.flags[67] && !game.insecretlab && !map.custommode) if (obj.flags[67] && !game.inspecial() && !map.custommode)
{ {
//Warp back to the ship //Warp back to the ship
graphics.resumegamemode = true; graphics.resumegamemode = true;
@ -2024,8 +2024,7 @@ void mapmenuactionpress()
} }
break; break;
case 3: case 3:
if (!game.gamesaved && !game.intimetrial if (!game.gamesaved && !game.inspecial())
&& !game.nodeathmode && !game.insecretlab && !game.inintermission)
{ {
game.flashlight = 5; game.flashlight = 5;
game.screenshake = 10; game.screenshake = 10;