From 224585d77482cc3ca76926eae8bda90a2a28bdb5 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Thu, 16 Apr 2020 19:52:39 -0700
Subject: [PATCH] Fix being able to mismatch summary and menu color

You were able to mismatch the color of the quicksave/telesave summary
and the text/background by pressing Esc when in the "continue" menu,
then pressing ACTION on "no, return".

This commit fixes that bug by putting the map.settowercolour(3) inside
the Menu::continuemenu creation code itself. However, since the
Menu::youwannaquit code does map.nexttowercolour() right after it does
the game.createmenu(), we also need to put the map.nexttowercolour()
before the game.createmenu() beforehand so it doesn't mess up the cyan
color that Menu::continuemenu sets.

Additionally, I removed the map.settowercolour() from the input handling
of Menu::play, as it's superfluous.
---
 desktop_version/src/Game.cpp  | 1 +
 desktop_version/src/Input.cpp | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index 6495e751..e11b81cd 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -7028,6 +7028,7 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
         menuyoff = 10;
         break;
     case Menu::continuemenu:
+        map.settowercolour(3);
         option("continue from teleporter");
         option("continue from quicksave");
         option("return to play menu");
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index 3d4c646b..febf1803 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -363,8 +363,8 @@ void menuactionpress()
             break;
         default:
             music.playef(11);
+            map.nexttowercolour(); //This goes first, otherwise mismatching continuemenu color is possible
             game.createmenu(game.previousmenuname);
-            map.nexttowercolour();
         }
         break;
     case Menu::setinvincibility:
@@ -871,7 +871,6 @@ void menuactionpress()
                 music.playef(11);
                 game.loadsummary(); //Prepare save slots to display
                 game.createmenu(Menu::continuemenu);
-                map.settowercolour(3);
             }
         }
         else if (game.currentmenuoption == 1 && game.unlock[8])