Client: Input: Sanitize sensitivity

tmp64 · Aug 24, 2024 · 5880d65 · 5880d65
1 parent 1280ee9
commit 5880d65
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/src/game/client/hud_msg.cpp b/src/game/client/hud_msg.cpp
@@ -41,12 +41,12 @@ void ClearEventList(void);
 #endif
 
 extern ConVar zoom_sensitivity_ratio;
-extern cvar_t *sensitivity;
 extern float g_lastFOV;
 
 cvar_t *cl_lw = nullptr;
 
 void CAM_ToFirstPerson(void);
+float IN_GetMouseSensitivity();
 
 /// USER-DEFINED SERVER MESSAGE HANDLERS
 
@@ -177,7 +177,7 @@ int CHud::MsgFunc_SetFOV(const char *pszName, int iSize, void *pbuf)
 	else
 	{
 		// set a new sensitivity that is proportional to the change from the FOV default
-		m_flMouseSensitivity = sensitivity->value * ((float)newfov / (float)def_fov) * zoom_sensitivity_ratio.GetFloat();
+		m_flMouseSensitivity = IN_GetMouseSensitivity() * ((float)newfov / (float)def_fov) * zoom_sensitivity_ratio.GetFloat();
 	}
 
 	// Update crosshair after zoom change

diff --git a/src/game/client/hud_redraw.cpp b/src/game/client/hud_redraw.cpp
@@ -34,8 +34,8 @@ int grgLogoFrame[MAX_LOGO_FRAMES] = {
 };
 
 float HUD_GetFOV(void);
+float IN_GetMouseSensitivity();
 
-extern cvar_t *sensitivity;
 extern ConVar zoom_sensitivity_ratio;
 
 ConVar hud_colortext("hud_colortext", "1", FCVAR_BHL_ARCHIVE);
@@ -82,7 +82,7 @@ void CHud::Think(void)
 	else
 	{
 		// set a new sensitivity that is proportional to the change from the FOV default
-		m_flMouseSensitivity = sensitivity->value * ((float)newfov / (float)default_fov.GetInt()) * zoom_sensitivity_ratio.GetFloat();
+		m_flMouseSensitivity = IN_GetMouseSensitivity() * ((float)newfov / (float)default_fov.GetInt()) * zoom_sensitivity_ratio.GetFloat();
 	}
 
 	// think about default fov

diff --git a/src/game/client/inputw32.cpp b/src/game/client/inputw32.cpp
@@ -635,6 +635,28 @@ void IN_GetMousePos(int *mx, int *my)
 	gEngfuncs.GetMousePosition(mx, my);
 }
 
+/*
+===========
+IN_GetMouseSensitivity
+
+Get mouse sensitivity with sanitization
+===========
+*/
+float IN_GetMouseSensitivity()
+{
+	// Absurdly high sensitivity values can cause the game to hang, so clamp
+	if (sensitivity->value > 10000.0)
+	{
+		gEngfuncs.Cvar_SetValue(sensitivity->name, 10000.0);
+	}
+	else if (sensitivity->value < 0.01)
+	{
+		gEngfuncs.Cvar_SetValue(sensitivity->name, 0.01);
+	}
+
+	return sensitivity->value;
+}
+
 /*
 ===========
 IN_ResetMouse
@@ -714,7 +736,7 @@ void IN_ScaleMouse(float *x, float *y)
 	float my = *y;
 
 	// This is the default sensitivity
-	float mouse_senstivity = (gHUD.GetSensitivity() != 0) ? gHUD.GetSensitivity() : sensitivity->value;
+	float mouse_senstivity = (gHUD.GetSensitivity() != 0) ? gHUD.GetSensitivity() : IN_GetMouseSensitivity();
 
 	// Using special accleration values
 	if (m_customaccel->value != 0)