Merge branch 'a1batross-patch-1'

twhl-community · Oct 16, 2024 · 453e1f5 · 453e1f5
2 parents 9552a3c + 3463b7f
commit 453e1f5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * Link Linux binaries with `-Wl` and `--no-undefined` flags to avoid situations where something was referenced but wasn't added in the build (Thanks a1batross)
 * Prevented game_zone_player from transitioning across levels to fix Mod_NumForName: not found issue [#241](https://github.com/twhl-community/halflife-updated/pull/241) (Thanks FreeSlave)
 * Fixed null dereference in game_score [#246](https://github.com/twhl-community/halflife-updated/pull/246) (Thanks FreeSlave)
+* Fixed null dereference of m_rawinput and mouse issues on Linux [#251](https://github.com/twhl-community/halflife-updated/pull/251) (Thanks a1batross)
 
 ### Features
 

diff --git a/FULL_UPDATED_CHANGELOG.md b/FULL_UPDATED_CHANGELOG.md
@@ -296,6 +296,7 @@ Fixes for bugs introduced in beta builds are not included in this list.
 * Added missing client side event for `func_vehicle` sounds
 * Prevented game_zone_player from transitioning across levels to fix Mod_NumForName: not found issue [#241](https://github.com/twhl-community/halflife-updated/pull/241) (Thanks FreeSlave)
 * Fixed null dereference in game_score [#246](https://github.com/twhl-community/halflife-updated/pull/246) (Thanks FreeSlave)
+* Fixed null dereference of m_rawinput and mouse issues on Linux [#251](https://github.com/twhl-community/halflife-updated/pull/251) (Thanks a1batross)
 
 ## Code cleanup
 

diff --git a/cl_dll/inputw32.cpp b/cl_dll/inputw32.cpp
@@ -67,7 +67,9 @@ static cvar_t* m_rawinput = nullptr;
 
 static bool IN_UseRawInput()
 {
-	return m_rawinput->value != 0;
+	// a1ba: m_rawinput 1 is SDL input on Windows
+	// Linux only has SDL input, so return true here
+	return m_rawinput ? m_rawinput->value != 0 : true;
 }
 
 static SDL_bool mouseRelative = SDL_TRUE;
@@ -268,11 +270,7 @@ void DLLEXPORT IN_ActivateMouse()
 		mouseactive = true;
 	}
 
-	if (g_iVisibleMouse
-#ifdef WIN32
-		|| !IN_UseRawInput()
-#endif
-	)
+	if (g_iVisibleMouse || !IN_UseRawInput())
 	{
 		IN_SetMouseRelative(false);
 	}
@@ -635,7 +633,6 @@ void IN_MouseMove(float frametime, usercmd_t* cmd)
 
 	gEngfuncs.SetViewAngles((float*)viewangles);
 
-#ifdef WIN32
 	if ((!IN_UseRawInput() && SDL_FALSE != mouseRelative) || g_iVisibleMouse)
 	{
 		IN_SetMouseRelative(false);
@@ -644,7 +641,6 @@ void IN_MouseMove(float frametime, usercmd_t* cmd)
 	{
 		IN_SetMouseRelative(true);
 	}
-#endif
 
 	/*
 //#define TRACE_TEST