From 9e1ca0cb8f127743675aa9907b8d90102b88d2de Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Thu, 30 Mar 2023 23:20:18 +1100
Subject: [PATCH] - Make the turbo turn functions static within
 `gameinput.cpp`.

---
 source/core/gameinput.cpp  | 11 ++++++-----
 source/core/gameinput.h    |  3 ---
 source/core/inputstate.cpp |  1 -
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/source/core/gameinput.cpp b/source/core/gameinput.cpp
index 38891735c..67cf3cc2e 100644
--- a/source/core/gameinput.cpp
+++ b/source/core/gameinput.cpp
@@ -95,17 +95,17 @@ static inline bool scaletozero(DAngle& angle, const double scale, const DAngle p
 
 static double turnheldtime;
 
-void updateTurnHeldAmt(const double scaleAdjust)
+static inline void updateTurnHeldAmt(const double scaleAdjust)
 {
 	turnheldtime += getTicrateScale(BUILDTICRATE) * scaleAdjust;
 }
 
-bool isTurboTurnTime()
+static inline bool isTurboTurnTime()
 {
 	return turnheldtime >= getTicrateScale(TURBOTURNBASE);
 }
 
-void resetTurnHeldAmt()
+static inline void resetTurnHeldAmt()
 {
 	turnheldtime = 0;
 }
@@ -238,13 +238,14 @@ void processVehicleInput(HIDInput* const hidInput, InputPacket* const inputBuffe
 void clearLocalInputBuffer()
 {
 	inputBuffer = {};
+	resetTurnHeldAmt();
 }
 
 void getInput(const double scaleAdjust, PlayerAngles* const plrAngles, InputPacket* packet)
 {
 	if (M_Active() || gamestate != GS_LEVEL || !plrAngles || !plrAngles->pActor)
 	{
-		clearLocalInputBuffer();
+		inputBuffer = {};
 		return;
 	}
 
@@ -267,7 +268,7 @@ void getInput(const double scaleAdjust, PlayerAngles* const plrAngles, InputPack
 	if (packet)
 	{
 		*packet = inputBuffer;
-		clearLocalInputBuffer();
+		inputBuffer = {};
 	}
 }
 
diff --git a/source/core/gameinput.h b/source/core/gameinput.h
index e11e5ab78..c77b93eee 100644
--- a/source/core/gameinput.h
+++ b/source/core/gameinput.h
@@ -82,9 +82,6 @@ class FSerializer;
 FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngles& w, PlayerAngles* def);
 
 
-void updateTurnHeldAmt(const double scaleAdjust);
-bool isTurboTurnTime();
-void resetTurnHeldAmt();
 void clearLocalInputBuffer();
 void processVehicleInput(HIDInput* const hidInput, InputPacket* const inputBuffer, InputPacket* const currInput, const double scaleAdjust, const float baseVel, const float velScale, const bool canMove, const bool canTurn, const bool attenuate);
 void getInput(const double scaleAdjust, PlayerAngles* const plrAngles, InputPacket* packet = nullptr);
diff --git a/source/core/inputstate.cpp b/source/core/inputstate.cpp
index 1eea713d4..941ab6e64 100644
--- a/source/core/inputstate.cpp
+++ b/source/core/inputstate.cpp
@@ -140,7 +140,6 @@ void InputState::ClearAllInput()
 	crouch_toggle = false;
 	buttonMap.ResetButtonStates();	// this is important. If all input is cleared, the buttons must be cleared as well.
 	clearLocalInputBuffer();		// also clear game local input state.
-	resetTurnHeldAmt();
 }