Merge branch 'a1batross-patch-1'

JoelTroch · JoelTroch · commit 453e1f5ceb01 · 2024-10-16T18:05:26.000+02:00
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

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,9 @@ static cvar_t* m_rawinput = nullptr;`
`67`	`67`
`68`	`68`	`static bool IN_UseRawInput()`
`69`	`69`	`{`
`70`		`- return m_rawinput->value != 0;`
	`70`	`+ // a1ba: m_rawinput 1 is SDL input on Windows`
	`71`	`+ // Linux only has SDL input, so return true here`
	`72`	`+ return m_rawinput ? m_rawinput->value != 0 : true;`
`71`	`73`	`}`
`72`	`74`
`73`	`75`	`static SDL_bool mouseRelative = SDL_TRUE;`
`@@ -268,11 +270,7 @@ void DLLEXPORT IN_ActivateMouse()`
`268`	`270`	`mouseactive = true;`
`269`	`271`	`}`
`270`	`272`
`271`		`- if (g_iVisibleMouse`
`272`		`-#ifdef WIN32`
`273`		`- \|\| !IN_UseRawInput()`
`274`		`-#endif`
`275`		`- )`
	`273`	`+ if (g_iVisibleMouse \|\| !IN_UseRawInput())`
`276`	`274`	`{`
`277`	`275`	`IN_SetMouseRelative(false);`
`278`	`276`	`}`
`@@ -635,7 +633,6 @@ void IN_MouseMove(float frametime, usercmd_t* cmd)`
`635`	`633`
`636`	`634`	`gEngfuncs.SetViewAngles((float*)viewangles);`
`637`	`635`
`638`		`-#ifdef WIN32`
`639`	`636`	`if ((!IN_UseRawInput() && SDL_FALSE != mouseRelative) \|\| g_iVisibleMouse)`
`640`	`637`	`{`
`641`	`638`	`IN_SetMouseRelative(false);`
`@@ -644,7 +641,6 @@ void IN_MouseMove(float frametime, usercmd_t* cmd)`
`644`	`641`	`{`
`645`	`642`	`IN_SetMouseRelative(true);`
`646`	`643`	`}`
`647`		`-#endif`
`648`	`644`
`649`	`645`	`/*`
`650`	`646`	`//#define TRACE_TEST`