diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index 3c83ef1e..19752004 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -6060,8 +6060,8 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ ) #if !defined(MAKEANDPLAY) option("unlock play modes"); #endif - option("invincibility", !ingame_titlemode || (!insecretlab && !intimetrial && !nodeathmode)); - option("slowdown", !ingame_titlemode || (!insecretlab && !intimetrial && !nodeathmode)); + option("invincibility", !ingame_titlemode || !incompetitive()); + option("slowdown", !ingame_titlemode || !incompetitive()); option("animated backgrounds"); option("screen effects"); option("text outline"); @@ -6805,3 +6805,8 @@ int Game::get_timestep(void) return 34; } } + +bool Game::incompetitive(void) +{ + return insecretlab || intimetrial || nodeathmode; +} diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index 28d9529d..9bfd4e71 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -636,7 +636,7 @@ static void menuactionpress(void) #endif if (game.currentmenuoption == accessibilityoffset + 0) { //invincibility - if (!game.ingame_titlemode || (!game.insecretlab && !game.intimetrial && !game.nodeathmode)) + if (!game.ingame_titlemode || !game.incompetitive()) { if (!map.invincibility) { @@ -658,7 +658,7 @@ static void menuactionpress(void) } else if (game.currentmenuoption == accessibilityoffset + 1) { //change game speed - if (!game.ingame_titlemode || (!game.insecretlab && !game.intimetrial && !game.nodeathmode)) + if (!game.ingame_titlemode || !game.incompetitive()) { game.createmenu(Menu::setslowdown); map.nexttowercolour();