From af70076088aa2db8df616579a0bc455d86e01ba7 Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Tue, 10 Nov 2020 00:27:42 -0800
Subject: [PATCH] Remove now-unneeded deltaframe fix when going to in-game
 settings

Previously, before the game loop order got fixed, going to the in-game
settings would switch over to the new render function too early, causing
a deltaframe glitch that had to be fixed. But now, the render function
only gets switched when the current gamestate's function list gets
finished executing, so the game won't suddenly switch to titlerender()
in the middle of the ACTION press to the in-game settings screen.

As a consequence, titleupdatetextcol() no longer needs to be exported to
Input.cpp.
---
 desktop_version/src/Input.cpp       | 5 -----
 desktop_version/src/RenderFixed.cpp | 2 +-
 desktop_version/src/RenderFixed.h   | 2 --
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index 42b64a67..dff5b350 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -11,7 +11,6 @@
 #include "MakeAndPlay.h"
 #include "Map.h"
 #include "Music.h"
-#include "RenderFixed.h"
 #include "Script.h"
 #include "UtilityClass.h"
 
@@ -2350,10 +2349,6 @@ static void mapmenuactionpress(void)
         }
 
         map.nexttowercolour();
-
-        // Fix delta rendering glitch
-        graphics.updatetowerbackground(graphics.titlebg);
-        titleupdatetextcol();
         break;
     }
 }
diff --git a/desktop_version/src/RenderFixed.cpp b/desktop_version/src/RenderFixed.cpp
index 8309654b..1fb3f2ab 100644
--- a/desktop_version/src/RenderFixed.cpp
+++ b/desktop_version/src/RenderFixed.cpp
@@ -7,7 +7,7 @@
 #include "Script.h"
 #include "UtilityClass.h"
 
-void titleupdatetextcol(void)
+static inline void titleupdatetextcol(void)
 {
     graphics.col_tr = graphics.titlebg.r - (help.glow / 4) - int(fRandom() * 4);
     graphics.col_tg = graphics.titlebg.g - (help.glow / 4) - int(fRandom() * 4);
diff --git a/desktop_version/src/RenderFixed.h b/desktop_version/src/RenderFixed.h
index cb0b8375..4953d91b 100644
--- a/desktop_version/src/RenderFixed.h
+++ b/desktop_version/src/RenderFixed.h
@@ -1,8 +1,6 @@
 #ifndef RENDERFIXED_H
 #define RENDERFIXED_H
 
-void titleupdatetextcol(void);
-
 void gamerenderfixed(void);
 
 void titlerenderfixed(void);