From 92154f4be1fb7a82f23075918051f1ee8aceb9f1 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Mon, 22 Jun 2020 15:24:18 -0700
Subject: [PATCH] Add start of better Esc menu

It's not functional yet, but here are the options:

    return to game
        quit to menu
            graphic options
                game options
---
 desktop_version/src/Input.cpp  |  6 ++++--
 desktop_version/src/Render.cpp | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index 8b876fef..770b671c 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -1744,7 +1744,7 @@ void gameinput()
                     game.gamestate = MAPMODE;
                     game.gamesaved = false;
                     graphics.resumegamemode = false;
-                    game.menupage = 10; // The Map Page
+                    game.menupage = 30; // Pause screen
 
                     BlitSurfaceStandard(graphics.menubuffer,NULL,graphics.backBuffer, NULL);
                     graphics.menuoffset = 240; //actually this should count the roomname
@@ -1924,7 +1924,7 @@ void mapinput()
             if (key.isDown(27))
             {
                 game.mapheld = true;
-                game.menupage = 10;
+                game.menupage = 30;
             }
         }
         else
@@ -2066,6 +2066,8 @@ void mapinput()
         if (game.menupage == 19) game.menupage = 21;
         if (game.menupage == 22) game.menupage = 20;
 
+        if (game.menupage == 29) game.menupage = 33;
+        if (game.menupage == 34) game.menupage = 30;
     }
 }
 
diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp
index e692e3f6..f272f99f 100644
--- a/desktop_version/src/Render.cpp
+++ b/desktop_version/src/Render.cpp
@@ -1685,6 +1685,27 @@ void maprender()
 #undef TAB
     }
 
+    // Draw menu header
+    switch (game.menupage)
+    {
+    case 30:
+    case 31:
+    case 32:
+    case 33:
+        graphics.Print(-1, 220, "[ PAUSE ]", 196, 196, 255 - help.glow, true);
+    }
+
+    // Draw menu options
+    if (game.menupage >= 30 && game.menupage <= 33)
+    {
+#define OPTION(opt, text) graphics.map_option(opt, 4, text, game.menupage - 30 == opt)
+        OPTION(0, "return to game");
+        OPTION(1, "quit to menu");
+        OPTION(2, "graphic options");
+        OPTION(3, "game options");
+#undef OPTION
+    }
+
     // Draw the actual menu
     switch(game.menupage)
     {