From 134510d26a86a37a53eb32d4e3b72f18950bea64 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Thu, 2 Apr 2020 19:26:16 -0700
Subject: [PATCH] Remove remnants of screen recording stuff

Most of the code was already commented out, and those comments were
removed in earlier commits, but this removes all recording variables
from Game and simplifies the game-gamestate handling in main.cpp a
little bit.
---
 desktop_version/src/Game.cpp |  5 ----
 desktop_version/src/Game.h   | 16 ----------
 desktop_version/src/main.cpp | 58 +++++++++++++-----------------------
 3 files changed, 20 insertions(+), 59 deletions(-)

diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index 9d89a7ec..d77d2065 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -148,11 +148,6 @@ void Game::init(void)
     press_left = 0;
 
 
-    recording = 0;
-    recordinit = false;
-    playbackfinished = false;
-    recordstring = "";
-
     advancetext = false;
     pausescript = false;
     completestop = false;
diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h
index 507fd55e..b0cb8ec0 100644
--- a/desktop_version/src/Game.h
+++ b/desktop_version/src/Game.h
@@ -284,22 +284,6 @@ public:
     int stretchMode;
     int controllerSensitivity;
 
-    //Screenrecording stuff, for beta/trailer
-    int recording;
-    std::string recordstring;
-    bool combomode;
-    int combolen;
-    std::string comboaction;
-    std::string currentaction;
-    bool recordinit;
-
-    std::vector<int> playback;
-    int playbackpos;
-    int playbacksize;
-    int playmove;
-    int playcombo;
-    bool playbackfinished;
-
     bool menukludge;
     bool quickrestartkludge;
 
diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp
index e63dd67b..4397cc09 100644
--- a/desktop_version/src/main.cpp
+++ b/desktop_version/src/main.cpp
@@ -348,8 +348,27 @@ int main(int argc, char *argv[])
                 else
                 {
 
-                    if (game.recording == 1)
+                    if (script.running)
                     {
+                        script.run();
+                    }
+
+                    gameinput();
+                    gamerender();
+                    gamelogic();
+
+
+                    break;
+                case MAPMODE:
+                    maprender();
+                    mapinput();
+                    maplogic();
+                    break;
+                case TELEPORTERMODE:
+                    teleporterrender();
+                    if(game.useteleporter)
+                    {
+                        teleporterinput();
                     }
                     else
                     {
@@ -357,44 +376,7 @@ int main(int argc, char *argv[])
                         {
                             script.run();
                         }
-
                         gameinput();
-                        gamerender();
-                        gamelogic();
-
-
-                    }
-                    break;
-                case MAPMODE:
-                    maprender();
-                    if (game.recording == 1)
-                    {
-                    }
-                    else
-                    {
-                        mapinput();
-                    }
-                    maplogic();
-                    break;
-                case TELEPORTERMODE:
-                    teleporterrender();
-                    if (game.recording == 1)
-                    {
-                    }
-                    else
-                    {
-                        if(game.useteleporter)
-                        {
-                            teleporterinput();
-                        }
-                        else
-                        {
-                            if (script.running)
-                            {
-                                script.run();
-                            }
-                            gameinput();
-                        }
                     }
                     maplogic();
                     break;