From aa40eb6327a4bc6628490a2be2d4f45684496ae4 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Mon, 22 Jun 2020 17:26:45 -0700
Subject: [PATCH] Move returning to pause menu code to separate function

This code is getting a bit more complicated now, we should maybe stop
copy-pasting it everywhere.
---
 desktop_version/src/Game.cpp  |  8 ++++++++
 desktop_version/src/Game.h    |  2 ++
 desktop_version/src/Input.cpp | 10 ++--------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index 604207b9..9b1a6694 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -7755,3 +7755,11 @@ void Game::returntoeditor()
     map.scrolldir = 0;
 }
 #endif
+
+void Game::returntopausemenu()
+{
+    ingame_titlemode = false;
+    returntomenu(kludge_ingametemp);
+    gamestate = MAPMODE;
+    map.kludge_to_bg();
+}
diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h
index ec2789c5..688bc61f 100644
--- a/desktop_version/src/Game.h
+++ b/desktop_version/src/Game.h
@@ -407,6 +407,8 @@ public:
     bool over30mode;
 
     bool ingame_titlemode;
+
+    void returntopausemenu();
 };
 
 extern Game game;
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index d11aa832..57427086 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -377,10 +377,7 @@ void menuactionpress()
             music.playef(11);
             if (game.ingame_titlemode)
             {
-                game.ingame_titlemode = false;
-                game.returntomenu(game.kludge_ingametemp);
-                game.gamestate = MAPMODE;
-                map.kludge_to_bg();
+                game.returntopausemenu();
             }
             else
             {
@@ -593,10 +590,7 @@ void menuactionpress()
             music.playef(11);
             if (game.ingame_titlemode)
             {
-                game.ingame_titlemode = false;
-                game.returntomenu(game.kludge_ingametemp);
-                game.gamestate = MAPMODE;
-                map.kludge_to_bg();
+                game.returntopausemenu();
             }
             else
             {