From eeb67a2cdd9f3033e0af2da1036a6530e564e186 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Thu, 30 Mar 2023 23:44:12 +1100
Subject: [PATCH] - Move all mouse CVARs from `inputstate.cpp` to
 `gameinput.cpp`.

---
 source/core/gameinput.cpp  | 23 ++++++++++++++++-------
 source/core/inputstate.cpp | 12 ++++--------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/source/core/gameinput.cpp b/source/core/gameinput.cpp
index a239a7206..5cb341a22 100644
--- a/source/core/gameinput.cpp
+++ b/source/core/gameinput.cpp
@@ -26,8 +26,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "gameinput.h"
 #include "d_net.h"
 
+//---------------------------------------------------------------------------
+//
+// CVARs to control mouse input sensitivity.
+//
+//---------------------------------------------------------------------------
+
 EXTERN_CVAR(Float, m_sensitivity_x)
-EXTERN_CVAR(Float, m_yaw)
+CVAR(Float, m_pitch, 1.f, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
+CVAR(Float, m_yaw, 1.f, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
+CVAR(Float, m_forward, 1.f, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
+CVAR(Float, m_side, 1.f, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
 
 
 //---------------------------------------------------------------------------
@@ -139,19 +148,19 @@ void processMovement(HIDInput* const hidInput, InputPacket* const currInput, con
 	{
 		const float turndir = clamp(turning + strafing * !allowstrafe, -1.f, 1.f);
 		const float turnspeed = float(getTicrateScale(YAW_TURNSPEEDS[keymove]) * turnscale * (isTurboTurnTime() ? 1. : YAW_PREAMBLESCALE));
-		currInput->avel += hidInput->mouseturnx - (hidInput->joyaxes[JOYAXIS_Yaw] * hidspeed - turndir * turnspeed) * scaleAdjustf;
+		currInput->avel += hidInput->mouseturnx * m_yaw - (hidInput->joyaxes[JOYAXIS_Yaw] * hidspeed - turndir * turnspeed) * scaleAdjustf;
 		if (turndir) updateTurnHeldAmt(scaleAdjust); else resetTurnHeldAmt();
 	}
 	else
 	{
-		currInput->svel += hidInput->mousemovex - (hidInput->joyaxes[JOYAXIS_Yaw] - turning) * keymove * scaleAdjustf;
+		currInput->svel += hidInput->mousemovex * m_side - (hidInput->joyaxes[JOYAXIS_Yaw] - turning) * keymove * scaleAdjustf;
 	}
 
 	// process player pitch input.
 	if (!(inputBuffer.actions & SB_AIMMODE))
-		currInput->horz -= hidInput->mouseturny + hidInput->joyaxes[JOYAXIS_Pitch] * hidspeed * scaleAdjustf;
+		currInput->horz -= hidInput->mouseturny * m_pitch + hidInput->joyaxes[JOYAXIS_Pitch] * hidspeed * scaleAdjustf;
 	else
-		currInput->fvel += hidInput->mousemovey + hidInput->joyaxes[JOYAXIS_Pitch] * keymove * scaleAdjustf;
+		currInput->fvel += hidInput->mousemovey * m_forward + hidInput->joyaxes[JOYAXIS_Pitch] * keymove * scaleAdjustf;
 
 	// process movement input.
 	currInput->fvel += moving * keymove;
@@ -182,7 +191,7 @@ void processVehicleInput(HIDInput* const hidInput, InputPacket* const currInput,
 		SB_AIM_UP | SB_AIM_DOWN | SB_AIMMODE | SB_LOOK_UP | SB_LOOK_DOWN | SB_LOOK_LEFT | SB_LOOK_RIGHT);
 
 	// Cancel out micro-movement
-	if (fabs(hidInput->mouseturnx) < (m_sensitivity_x * m_yaw * backendinputscale() * 2.f)) 
+	if (fabs(hidInput->mouseturnx) < (m_sensitivity_x * backendinputscale() * 2.f)) 
 		hidInput->mouseturnx = 0;
 
 	// Yes, we need all these bools...
@@ -219,7 +228,7 @@ void processVehicleInput(HIDInput* const hidInput, InputPacket* const currInput,
 
 		if (hidInput->mouseturnx)
 		{
-			currInput->avel += sqrtf(abs(vel * hidInput->mouseturnx / (float)scaleAdjust) * (7.f / 20.f)) * Sgn(vel) * Sgn(hidInput->mouseturnx);
+			currInput->avel += sqrtf(abs(vel * hidInput->mouseturnx * m_yaw / (float)scaleAdjust) * (7.f / 20.f)) * Sgn(vel) * Sgn(hidInput->mouseturnx);
 		}
 
 		currInput->avel *= (float)scaleAdjust;
diff --git a/source/core/inputstate.cpp b/source/core/inputstate.cpp
index ef1b1ecd6..9b26568d1 100644
--- a/source/core/inputstate.cpp
+++ b/source/core/inputstate.cpp
@@ -45,10 +45,6 @@
 #include "gameinput.h"
 
 // Mouse speeds
-CVAR(Float, m_pitch, 1.f, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
-CVAR(Float, m_yaw, 1.f, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
-CVAR(Float, m_forward, 1.f, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
-CVAR(Float, m_side, 1.f, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
 CVARD(Bool, invertmousex, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG, "invert horizontal mouse movement")
 CVARD(Bool, invertmouse, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG, "invert vertical mouse movement")
 
@@ -62,10 +58,10 @@ void InputState::GetMouseDelta(HIDInput * hidInput)
 {
 	g_mousePos *= backendinputscale();
 
-	hidInput->mouseturnx = g_mousePos.X * m_yaw;
-	hidInput->mouseturny = g_mousePos.Y * m_pitch;
-	hidInput->mousemovex = g_mousePos.X * m_side;
-	hidInput->mousemovey = g_mousePos.Y * m_forward;
+	hidInput->mouseturnx = g_mousePos.X;
+	hidInput->mouseturny = g_mousePos.Y;
+	hidInput->mousemovex = g_mousePos.X;
+	hidInput->mousemovey = g_mousePos.Y;
 
 	if (invertmousex)
 	{