Fix mouse cursor being invisible in VGUI1 menus when raw input is ena…

…bled

Resolves #211

CHANGELOG.md

@@ -8,6 +8,7 @@
 
 * Fixed hand grenade animations not playing correctly [#209](https://github.com/SamVanheer/halflife-updated/pull/209) (Thanks Toodles2You)
 * Fixed out of bounds access in studiomodel renderer bone setup code (halflife issue [#3360](https://github.com/ValveSoftware/halflife/issues/3360))
+* Fixed mouse cursor being invisible in VGUI1 menus when raw input is enabled [#211](https://github.com/SamVanheer/halflife-updated/issues/211) (Thanks RykahKnight)
 
 ### Features
 

cl_dll/inputw32.cpp

@@ -72,6 +72,16 @@ static bool IN_UseRawInput()
 	return m_rawinput->value != 0;
 }
 
+static SDL_bool mouseRelative = SDL_TRUE;
+
+static void IN_SetMouseRelative(bool enable)
+{
+	const SDL_bool value = enable ? SDL_TRUE : SDL_FALSE;
+
+	SDL_SetRelativeMouseMode(value);
+	mouseRelative = value;
+}
+
 static bool m_bMouseThread = false;
 
 // mouse variables
@@ -192,8 +202,6 @@ struct MouseThread
 
 MouseThread s_MouseThread;
 
-SDL_bool mouseRelative = SDL_TRUE;
-
 std::atomic<Point> s_mouseDelta;
 std::atomic<Point> current_pos;
 std::atomic<Point> old_mouse_pos;
@@ -261,20 +269,18 @@ void DLLEXPORT IN_ActivateMouse()
 		mouseactive = true;
 	}
 
+	if (g_iVisibleMouse
 #ifdef WIN32
-	if (!IN_UseRawInput())
+		|| !IN_UseRawInput()
+#endif
+	)
 	{
-		SDL_SetRelativeMouseMode(SDL_FALSE);
-		mouseRelative = SDL_FALSE;
+		IN_SetMouseRelative(false);
 	}
 	else
 	{
-		mouseRelative = SDL_TRUE;
-		SDL_SetRelativeMouseMode(SDL_TRUE);
+		IN_SetMouseRelative(true);
 	}
-#else
-	SDL_SetRelativeMouseMode(SDL_TRUE);
-#endif
 }
 
 
@@ -296,14 +302,7 @@ void DLLEXPORT IN_DeactivateMouse()
 		mouseactive = false;
 	}
 
-#ifdef WIN32
-	if (IN_UseRawInput())
-	{
-		mouseRelative = SDL_FALSE;
-	}
-
-#endif
-	SDL_SetRelativeMouseMode(SDL_FALSE);
+	IN_SetMouseRelative(false);
 }
 
 /*
@@ -390,10 +389,9 @@ void IN_ResetMouse()
 {
 	// no work to do in SDL
 #ifdef WIN32
-	if (IN_UseRawInput())
+	if (IN_UseRawInput() && !g_iVisibleMouse)
 	{
-		mouseRelative = SDL_TRUE;
-		SDL_SetRelativeMouseMode(SDL_TRUE);
+		IN_SetMouseRelative(true);
 	}
 
 	if (!IN_UseRawInput() && mouseactive && gEngfuncs.GetWindowCenterX && gEngfuncs.GetWindowCenterY)
@@ -604,15 +602,13 @@ void IN_MouseMove(float frametime, usercmd_t* cmd)
 	gEngfuncs.SetViewAngles((float*)viewangles);
 
 #ifdef WIN32
-	if (!IN_UseRawInput() && SDL_FALSE != mouseRelative)
+	if ((!IN_UseRawInput() && SDL_FALSE != mouseRelative) || g_iVisibleMouse)
 	{
-		SDL_SetRelativeMouseMode(SDL_FALSE);
-		mouseRelative = SDL_FALSE;
+		IN_SetMouseRelative(false);
 	}
 	else if (IN_UseRawInput() && SDL_FALSE == mouseRelative)
 	{
-		SDL_SetRelativeMouseMode(SDL_TRUE);
-		mouseRelative = SDL_TRUE;
+		IN_SetMouseRelative(true);
 	}
 #endif