From 100d98643182af0c15db50351ee92aed432c4049 Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Fri, 19 Mar 2021 23:34:41 -0700
Subject: [PATCH] Remove mainmenu from Game

Since mainmenu is only ever used in Input.cpp, I might as well make it
clearer by moving it into a static global variable in Input.cpp. (The
same applies to fadetolab/fadetomenu, but I didn't think much about
those at the time... that'll be a refactor for later.)
---
 desktop_version/src/Game.h    | 1 -
 desktop_version/src/Input.cpp | 5 +++--
 desktop_version/src/main.cpp  | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h
index bae820a2..d7a3cfbf 100644
--- a/desktop_version/src/Game.h
+++ b/desktop_version/src/Game.h
@@ -242,7 +242,6 @@ public:
     bool startscript;
     std::string newscript;
 
-    int mainmenu;
     bool menustart;
 
     //Teleporting
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index b06fa62a..b80cb8ea 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -190,10 +190,11 @@ static void toggleflipmode(void)
 
 static bool fadetomode = false;
 static int fadetomodedelay = 0;
+static int gotomode = 0;
 
 static void startmode(const int mode)
 {
-    game.mainmenu = mode;
+    gotomode = mode;
     graphics.fademode = 2; /* fading out */
     fadetomode = true;
     fadetomodedelay = 16;
@@ -1668,7 +1669,7 @@ void titleinput(void)
         else
         {
             fadetomode = false;
-            script.startgamemode(game.mainmenu);
+            script.startgamemode(gotomode);
         }
     }
 }
diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp
index 0f8036b0..9825894d 100644
--- a/desktop_version/src/main.cpp
+++ b/desktop_version/src/main.cpp
@@ -505,7 +505,6 @@ int main(int argc, char *argv[])
     game.gamestate = PRELOADER;
 
     game.menustart = false;
-    game.mainmenu = 0;
 
     // Initialize title screen to cyan
     graphics.titlebg.colstate = 10;