From cbd7ef94bac1c53cccbc43fa4be37c7d060846ce Mon Sep 17 00:00:00 2001 From: Misa Date: Wed, 15 Apr 2020 20:33:04 -0700 Subject: [PATCH] Gray out play modes if disabled due to enabled accessibility options If you have invincibility mode or slowdown enabled, the game will not let you select the Secret Lab, Time Trials, or No Death Mode. To make this clearer, this commit grays out said options if they are disabled for that reason. --- desktop_version/src/Game.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index bfe9a1f2..08302b77 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -6945,7 +6945,7 @@ void Game::createmenu( std::string t ) //ok, secret lab! no notification, but test: if (unlock[8]) { - option("secret lab"); + option("secret lab", !map.invincibility && game.slowdown == 30); } option("play modes"); option("new game"); @@ -6982,9 +6982,9 @@ void Game::createmenu( std::string t ) } else if (t == "playmodes") { - option("time trials"); + option("time trials", !map.invincibility && game.slowdown == 30); option("intermissions", unlock[16]); - option("no death mode", unlock[17]); + option("no death mode", unlock[17] && !map.invincibility && game.slowdown == 30); option("flip mode", unlock[18]); option("return to play menu"); menuxoff = -70;