From 69aeac24101c73d7d12f33ee4563b36dd25fac57 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Thu, 7 May 2020 15:17:04 -0700
Subject: [PATCH] Move return to lab code to Game::returntolab()

Again, I'll keep gamestate 96 and 97 for compatibility reasons, but
ultimately we shouldn't be using gamestates to return to the lab.
---
 desktop_version/src/Game.cpp | 13 +++++++++----
 desktop_version/src/Game.h   |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index 6aee3ddd..a5640fc0 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -1461,10 +1461,7 @@ void Game::updatestate()
             if(graphics.fademode == 1)	state++;
             break;
         case 97:
-            gamestate = GAMEMODE;
-            graphics.fademode = 4;
-            startscript = true;
-            newscript="returntolab";
+            returntolab();
             state = 0;
             break;
 
@@ -7354,3 +7351,11 @@ void Game::quittomenu()
     }
     script.hardreset();
 }
+
+void Game::returntolab()
+{
+    gamestate = GAMEMODE;
+    graphics.fademode = 4;
+    startscript = true;
+    newscript="returntolab";
+}
diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h
index 8355755f..47fe2204 100644
--- a/desktop_version/src/Game.h
+++ b/desktop_version/src/Game.h
@@ -380,6 +380,7 @@ public:
     int playgc;
 
     void quittomenu();
+    void returntolab();
 };
 
 extern Game game;