From f1f6e3a607f72bec84ddf678127387c28032dc80 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Tue, 4 Apr 2023 19:59:09 +1000
Subject: [PATCH] - Move `invertmouse` CVARs into common code.
* Removes duplication of CVAR definitions between Raze and GZDoom.
---
src/common/engine/d_event.cpp | 5 +++++
src/d_main.cpp | 5 -----
src/g_game.cpp | 2 --
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/common/engine/d_event.cpp b/src/common/engine/d_event.cpp
index 15edef9aa1..ce11d3b1e4 100644
--- a/src/common/engine/d_event.cpp
+++ b/src/common/engine/d_event.cpp
@@ -50,6 +50,8 @@ event_t events[MAXEVENTS];
CVAR(Float, m_sensitivity_x, 2.f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
CVAR(Float, m_sensitivity_y, 2.f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
+CVAR(Bool, invertmouse, false, CVAR_GLOBALCONFIG | CVAR_ARCHIVE); // Invert mouse look down/up?
+CVAR(Bool, invertmousex, false, CVAR_GLOBALCONFIG | CVAR_ARCHIVE); // Invert mouse look left/right?
//==========================================================================
@@ -171,6 +173,9 @@ void PostMouseMove(int xx, int yy)
ev.x = float(xx) * m_sensitivity_x;
ev.y = -float(yy) * m_sensitivity_y;
+ if (invertmousex) ev.x = -ev.x;
+ if (invertmouse) ev.y = -ev.y;
+
if (ev.x || ev.y)
{
ev.type = EV_Mouse;
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 9d00033d58..31e1568ba8 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -186,8 +186,6 @@ EXTERN_CVAR (Float, turbo)
EXTERN_CVAR (Bool, freelook)
EXTERN_CVAR (Float, m_pitch)
EXTERN_CVAR (Float, m_yaw)
-EXTERN_CVAR (Bool, invertmouse)
-EXTERN_CVAR (Bool, invertmousex)
EXTERN_CVAR (Bool, lookstrafe)
EXTERN_CVAR (Int, screenblocks)
EXTERN_CVAR (Bool, sv_cheats)
@@ -2672,15 +2670,12 @@ static bool System_DispatchEvent(event_t* ev)
if (buttonMap.ButtonDown(Button_Mlook) || freelook)
{
int look = int(ev->y * m_pitch * 16.0);
- if (invertmouse) look = -look;
G_AddViewPitch(look, true);
ev->y = 0;
}
if (!buttonMap.ButtonDown(Button_Strafe) && !lookstrafe)
{
int turn = int(ev->x * m_yaw * 16.0);
- if (invertmousex)
- turn = -turn;
G_AddViewAngle(turn, true);
ev->x = 0;
}
diff --git a/src/g_game.cpp b/src/g_game.cpp
index 7ac7fd98d2..c7ee9c3b74 100644
--- a/src/g_game.cpp
+++ b/src/g_game.cpp
@@ -202,8 +202,6 @@ int lookspeed[2] = {450, 512};
#define SLOWTURNTICS 6
CVAR (Bool, cl_run, false, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) // Always run?
-CVAR (Bool, invertmouse, false, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) // Invert mouse look down/up?
-CVAR (Bool, invertmousex, false, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) // Invert mouse look left/right?
CVAR (Bool, freelook, true, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) // Always mlook?
CVAR (Bool, lookstrafe, false, CVAR_GLOBALCONFIG|CVAR_ARCHIVE) // Always strafe with mouse?
CVAR (Float, m_forward, 1.f, CVAR_GLOBALCONFIG|CVAR_ARCHIVE)