From 4274843a4ba7c5143932ab0058789fbacd5137b2 Mon Sep 17 00:00:00 2001 From: Misa Date: Mon, 22 Jun 2020 15:37:19 -0700 Subject: [PATCH] Use game.inspecial() in mapmenuactionpress() Apart from covering more cases with the SHIP option, it also makes the if-guard for case 3 much less noisy on the eyes. --- desktop_version/src/Input.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index 41826bcf..ca9f6d89 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -1999,7 +1999,7 @@ void mapmenuactionpress() switch (game.menupage) { case 1: - if (obj.flags[67] && !game.insecretlab && !map.custommode) + if (obj.flags[67] && !game.inspecial() && !map.custommode) { //Warp back to the ship graphics.resumegamemode = true; @@ -2024,8 +2024,7 @@ void mapmenuactionpress() } break; case 3: - if (!game.gamesaved && !game.intimetrial - && !game.nodeathmode && !game.insecretlab && !game.inintermission) + if (!game.gamesaved && !game.inspecial()) { game.flashlight = 5; game.screenshake = 10;