From 561d756baa28d6dcab4c26808d6e45b44ff70b88 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Wed, 4 Oct 2023 09:27:15 +1100
Subject: [PATCH] - Duke: Repair `SB_CENTERVIEW` not re-applying on the first
 tic.

---
 source/core/coreplayer.h  | 5 +++++
 source/core/gameinput.cpp | 2 +-
 source/core/mainloop.cpp  | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/source/core/coreplayer.h b/source/core/coreplayer.h
index d15fc7431..387000f29 100644
--- a/source/core/coreplayer.h
+++ b/source/core/coreplayer.h
@@ -32,3 +32,8 @@ public:
 };
 
 extern DCorePlayer* PlayerArray[MAXPLAYERS];
+
+inline ESyncBits GetPersistentActions()
+{
+	return PlayerArray[myconnectindex]->cmd.ucmd.actions & SB_CENTERVIEW;
+}
diff --git a/source/core/gameinput.cpp b/source/core/gameinput.cpp
index 15ccb5ebf..036c2f368 100644
--- a/source/core/gameinput.cpp
+++ b/source/core/gameinput.cpp
@@ -272,7 +272,7 @@ void GameInput::processInputBits()
 	else dpad_lock = 0;
 
 	const auto crouchState = gi->getCrouchState();
-	inputBuffer.actions |= ActionsToSend | (PlayerArray[myconnectindex]->cmd.ucmd.actions & SB_CENTERVIEW);
+	inputBuffer.actions |= ActionsToSend | GetPersistentActions();
 	ActionsToSend = 0;
 
 	if (buttonMap.ButtonDown(gamefunc_Aim_Up) || (buttonMap.ButtonDown(gamefunc_Dpad_Aiming) && joyAxes[JOYAXIS_Forward] > 0)) 
diff --git a/source/core/mainloop.cpp b/source/core/mainloop.cpp
index 287b453cf..41d36c33a 100644
--- a/source/core/mainloop.cpp
+++ b/source/core/mainloop.cpp
@@ -275,6 +275,7 @@ static void GameTicker()
 			Net_ClearFifo();
 			inputState.ClearAllInput();
 			gameInput.Clear();
+			gameInput.SendAction(GetPersistentActions());
 			gamestate = GS_LEVEL;
 			return;