From c61025c172e8a8daaf4acda2b9dc1e5164ef86b5 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Thu, 7 May 2020 15:57:20 -0700
Subject: [PATCH] Remove fademode check from quitting to menu

This means you're allowed to quit to the menu even if you're faded-out,
because it's weird if you can close the menu but not be able to quit.
---
 desktop_version/src/Input.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index e9fe2b3c..638ca9fb 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -1971,8 +1971,7 @@ void mapinput()
         if (game.menupage == 11 && game.press_action)
         {
             //quit to menu
-            if (graphics.fademode == 0)
-            {
+
                 //Kill contents of offset render buffer, since we do that for some reason.
                 //This fixes an apparent frame flicker.
                 FillRect(graphics.tempBuffer, 0x000000);
@@ -1981,7 +1980,6 @@ void mapinput()
                 map.nexttowercolour();
                 game.fadetomenu = true;
                 game.fadetomenudelay = 15;
-            }
         }
 
         if (game.menupage == 20 && game.press_action)
@@ -1992,14 +1990,11 @@ void mapinput()
         if (game.menupage == 21 && game.press_action)
         {
             //quit to menu
-            if (graphics.fademode == 0)
-            {
                 game.swnmode = false;
                 graphics.fademode = 2;
                 music.fadeout();
                 game.fadetolab = true;
                 game.fadetolabdelay = 15;
-            }
         }
 
         if (game.menupage < 0) game.menupage = 3;