Merge pull request #243 from tmp64/feature/input-fixes

Input updates
tmp64 · Aug 24, 2024 · 903535f · 903535f
2 parents ba8dc22 + 29506c1
commit 903535f
Show file tree

Hide file tree

Showing 8 changed files with 161 additions and 83 deletions.
diff --git a/gamedir/ui/resource/language/bugfixedhl_english.txt b/gamedir/ui/resource/language/bugfixedhl_english.txt
diff --git a/gamedir/ui/resource/language/bugfixedhl_russian.txt b/gamedir/ui/resource/language/bugfixedhl_russian.txt
diff --git a/src/game/client/gameui/options/options_general.cpp b/src/game/client/gameui/options/options_general.cpp
@@ -10,6 +10,7 @@
 #include "hud.h"
 #include "cl_util.h"
 #include "engine_patches.h"
+#include "sdl_rt.h"
 
 extern ConVar m_input;
 
@@ -27,7 +28,7 @@ CGeneralSubOptions::CGeneralSubOptions(vgui2::Panel *parent)
 
 	m_pRawInputLabel = new vgui2::Label(this, "RawInputLabel", "#BHL_AdvOptions_General_Input");
 	m_pInputMethodBox = new vgui2::ComboBox(this, "InputMethodBox", 3, false);
-	m_InputMethodItems[0] = m_pInputMethodBox->AddItem("#BHL_AdvOptions_General_InputEng", new KeyValues("Item", "value", 0));
+	m_InputMethodItems[0] = m_pInputMethodBox->AddItem("#BHL_AdvOptions_General_InputWin", new KeyValues("Item", "value", 0));
 	m_InputMethodItems[1] = m_pInputMethodBox->AddItem(GetItemText("BHL_AdvOptions_General_InputDX", IsWindows()), new KeyValues("Item", "value", 1));
 	m_InputMethodItems[2] = m_pInputMethodBox->AddItem(GetItemText("BHL_AdvOptions_General_InputSDL", !IsWindows()), new KeyValues("Item", "value", 2));
 
@@ -51,11 +52,9 @@ CGeneralSubOptions::CGeneralSubOptions(vgui2::Panel *parent)
 	LoadControlSettings(VGUI2_ROOT_DIR "resource/options/GeneralSubOptions.res");
 
 	// Disable unsupported input methods
-	if (!IsWindows())
-		m_pInputMethodBox->SetItemEnabled(m_InputMethodItems[1], false);
-
-	if (!CEnginePatches::Get().IsSDLEngine())
-		m_pInputMethodBox->SetItemEnabled(m_InputMethodItems[2], false);
+	m_pInputMethodBox->SetItemEnabled(m_InputMethodItems[0], IsWindows()); // WindowsCursor
+	m_pInputMethodBox->SetItemEnabled(m_InputMethodItems[1], IsWindows()); // DirectInput
+	m_pInputMethodBox->SetItemEnabled(m_InputMethodItems[2], GetSDL()->IsGood()); // RawInput
 
 	// Disable HTML MOTD if SteamAPI not available
 	if (!SteamAPI_IsAvailable())

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