Fix bringing up map menu during gamemode(teleporter)

When gamemode(teleporter) gets run in a script, it brings up a read-only
version of the teleporter screen, intended only for displaying rooms on
the minimap.

However, ever since 2.3 allowed bringing up the map screen during
cutscenes (in order to prevent softlocks), bringing up the map screen
during this mode would (1) do an unnecessary animation of suddenly
switching back to the game and bringing up the menu screen again (even
though the menu screen has already been brought up), and (2) would let
you close the menu entirely and go back to GAMEMODE, thus
unintentionally closing the teleporter screen and kind of ruining the
cutscene.

To fix this, when you bring up the map screen, it will instead instantly
transition to the map screen. And when you bring it down, it will also
instantly transition back to the teleporter screen.

But that's not all. The previous behavior was actually kind of a nice
failsafe, in that if you somehow got stuck in a state where a script ran
gamemode(teleporter), but stopped running before it could take you out
of that mode by running gamemode(game), then you could return to
GAMEMODE yourself by bringing up the map screen and then bringing it
back down. So I've made sure to keep that failsafe behavior, only as
long as there isn't a script running.

desktop_version/src/Game.cpp

@@ -117,6 +117,8 @@ void Game::init(void)
     musicmutebutton = 0;
 
     glitchrunkludge = false;
+    gamestate = TITLEMODE;
+    prevgamestate = TITLEMODE;
     hascontrol = true;
     jumpheld = false;
     advancetext = false;
@@ -7146,3 +7148,25 @@ void Game::unlockAchievement(const char *name) {
     if (!map.custommode) NETWORK_unlockAchievement(name);
 #endif
 }
+
+void Game::mapmenuchange(const int newgamestate)
+{
+    prevgamestate = gamestate;
+    gamestate = newgamestate;
+    graphics.resumegamemode = false;
+    mapheld = true;
+
+    if (prevgamestate == GAMEMODE)
+    {
+        graphics.menuoffset = 240;
+        if (map.extrarow)
+        {
+            graphics.menuoffset -= 10;
+        }
+    }
+    else
+    {
+        graphics.menuoffset = 0;
+    }
+    graphics.oldmenuoffset = graphics.menuoffset;
+}

desktop_version/src/Game.h

@@ -206,6 +206,7 @@ public:
     bool glitchrunkludge;
 
     int gamestate;
+    int prevgamestate; //only used sometimes
     bool hascontrol, jumpheld;
     int jumppressed;
     int gravitycontrol;
@@ -218,6 +219,7 @@ public:
     int tapleft, tapright;
 
     //Menu interaction stuff
+    void mapmenuchange(const int newgamestate);
     bool mapheld;
     int menupage;
     int lastsaved;

desktop_version/src/Input.cpp

@@ -1769,7 +1769,16 @@ void gameinput()
         }
     }
 
-    if (!game.press_map) game.mapheld = false;
+    if (!game.press_map
+    //Extra conditionals as a kludge fix so if you open the quit menu during
+    //the script command gamemode(teleporter) and close it with Esc, it won't
+    //immediately open again
+    //We really need a better input system soon...
+    && !key.isDown(27)
+    && !key.isDown(game.controllerButton_esc))
+    {
+        game.mapheld = false;
+    }
 
     if (game.intimetrial && graphics.fademode == 1 && game.quickrestartkludge)
     {
@@ -1846,18 +1855,7 @@ void gameinput()
                             else if (game.companion == 0)
                             {
                                 //Alright, normal teleporting
-                                game.gamestate = TELEPORTERMODE;
-                                graphics.menuoffset = 240; //actually this should count the roomname
-                                graphics.oldmenuoffset = 240;
-                                if (map.extrarow)
-                                {
-                                    graphics.menuoffset -= 10;
-                                    graphics.oldmenuoffset -= 10;
-                                }
-
-                                BlitSurfaceStandard(graphics.menubuffer,NULL,graphics.backBuffer, NULL);
-
-                                graphics.resumegamemode = false;
+                                game.mapmenuchange(TELEPORTERMODE);
 
                                 game.useteleporter = true;
                                 game.initteleportermode();
@@ -2010,19 +2008,10 @@ void gameinput()
         //quitting the super gravitron
         game.mapheld = true;
         //Quit menu, same conditions as in game menu
-        game.gamestate = MAPMODE;
+        game.mapmenuchange(MAPMODE);
         game.gamesaved = false;
         game.gamesavefailed = false;
-        graphics.resumegamemode = false;
         game.menupage = 20; // The Map Page
-        BlitSurfaceStandard(graphics.menubuffer,NULL,graphics.backBuffer, NULL);
-        graphics.menuoffset = 240; //actually this should count the roomname
-        graphics.oldmenuoffset = 240;
-        if (map.extrarow)
-        {
-            graphics.menuoffset -= 10;
-            graphics.oldmenuoffset -= 10;
-        }
     }
     else if (game.intimetrial && graphics.fademode == 0)
     {
@@ -2039,12 +2028,11 @@ void gameinput()
     else
     {
         //Normal map screen, do transition later
-        game.gamestate = MAPMODE;
+        game.mapmenuchange(MAPMODE);
         map.cursordelay = 0;
         map.cursorstate = 0;
         game.gamesaved = false;
         game.gamesavefailed = false;
-        graphics.resumegamemode = false;
         if (script.running)
         {
             game.menupage = 3; // Only allow saving
@@ -2053,34 +2041,18 @@ void gameinput()
         {
             game.menupage = 0; // The Map Page
         }
-        BlitSurfaceStandard(graphics.menubuffer,NULL,graphics.backBuffer, NULL);
-        graphics.menuoffset = 240; //actually this should count the roomname
-        graphics.oldmenuoffset = 240;
-        if (map.extrarow)
-        {
-            graphics.menuoffset -= 10;
-            graphics.oldmenuoffset -= 10;
-        }
     }
 
-    if ((key.isDown(27) || key.isDown(game.controllerButton_esc)) && (!map.custommode || map.custommodeforreal))
+    if (!game.mapheld
+    && (key.isDown(27) || key.isDown(game.controllerButton_esc))
+    && (!map.custommode || map.custommodeforreal))
     {
         game.mapheld = true;
         //Quit menu, same conditions as in game menu
-        game.gamestate = MAPMODE;
+        game.mapmenuchange(MAPMODE);
         game.gamesaved = false;
         game.gamesavefailed = false;
-        graphics.resumegamemode = false;
         game.menupage = 30; // Pause screen
-
-        BlitSurfaceStandard(graphics.menubuffer,NULL,graphics.backBuffer, NULL);
-        graphics.menuoffset = 240; //actually this should count the roomname
-        graphics.oldmenuoffset = 240;
-        if (map.extrarow)
-        {
-            graphics.menuoffset -= 10;
-            graphics.oldmenuoffset -= 10;
-        }
     }
 
     if (game.deathseq == -1 && (key.isDown(SDLK_r) || key.isDown(game.controllerButton_restart)) && !game.nodeathmode)// && map.custommode) //Have fun glitchrunners!

desktop_version/src/RenderFixed.cpp

@@ -197,14 +197,27 @@ void maprenderfixed()
     graphics.oldmenuoffset = graphics.menuoffset;
     if (graphics.resumegamemode)
     {
-        graphics.menuoffset += 25;
-        int threshold = map.extrarow ? 230 : 240;
-        if (graphics.menuoffset >= threshold)
+        if (game.prevgamestate == GAMEMODE
+        //Failsafe: if the script command gamemode(teleporter) got ran and the
+        //cutscene stopped without doing gamemode(game), then we need to go
+        //back to GAMEMODE, not game.prevgamestate (TELEPORTERMODE)
+        || !script.running)
+        {
+            graphics.menuoffset += 25;
+            int threshold = map.extrarow ? 230 : 240;
+            if (graphics.menuoffset >= threshold)
+            {
+                graphics.menuoffset = threshold;
+                //go back to gamemode!
+                game.mapheld = true;
+                game.gamestate = GAMEMODE;
+            }
+        }
+        else
         {
-            graphics.menuoffset = threshold;
-            //go back to gamemode!
             game.mapheld = true;
-            game.gamestate = GAMEMODE;
+            game.gamestate = game.prevgamestate;
+            graphics.resumegamemode = false;
         }
     }
     else if (graphics.menuoffset > 0)

desktop_version/src/Script.cpp

@@ -1322,23 +1322,14 @@ void scriptclass::run()
 			{
 				if (words[1] == "teleporter")
 				{
-					//TODO this draw the teleporter screen. This is a problem. :(
-					game.gamestate = TELEPORTERMODE;
-					graphics.menuoffset = 240; //actually this should count the roomname
-					graphics.oldmenuoffset = 240;
-					if (map.extrarow)
-					{
-						graphics.menuoffset -= 10;
-						graphics.oldmenuoffset -= 10;
-					}
-
-					graphics.resumegamemode = false;
+					game.mapmenuchange(TELEPORTERMODE);
 
 					game.useteleporter = false; //good heavens don't actually use it
 				}
 				else if (words[1] == "game")
 				{
 					graphics.resumegamemode = true;
+					game.prevgamestate = GAMEMODE;
 				}
 			}
 			else if (words[0] == "ifexplored")