Merge pull request #32 from IntriguingTiles/fix/raw-mouse

Fix camera not being consistently centered when raw mouse input is enabled
twhl-community · Aug 24, 2021 · d872ad0 · d872ad0
2 parents c2902f8 + 49ecab8
commit d872ad0
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/cl_dll/inputw32.cpp b/cl_dll/inputw32.cpp
@@ -380,19 +380,25 @@ void IN_ResetMouse()
 {
 	// no work to do in SDL
 #ifdef _WIN32
+	if ( gpGlobals && ( gpGlobals->time - s_flRawInputUpdateTime > 1.0f || s_flRawInputUpdateTime == 0.0f ) )
+	{
+		s_flRawInputUpdateTime = gpGlobals->time;
+		m_bRawInput = CVAR_GET_FLOAT( "m_rawinput" ) != 0;
+
+		if ( m_bRawInput )
+		{
+			mouseRelative = SDL_TRUE;
+			SDL_SetRelativeMouseMode( SDL_TRUE );
+		}
+	}
+
 	if ( !m_bRawInput && mouseactive && gEngfuncs.GetWindowCenterX && gEngfuncs.GetWindowCenterY )
 	{
 
 		SetCursorPos ( gEngfuncs.GetWindowCenterX(), gEngfuncs.GetWindowCenterY() );
 		ThreadInterlockedExchange( &old_mouse_pos.x, gEngfuncs.GetWindowCenterX() );
 		ThreadInterlockedExchange( &old_mouse_pos.y, gEngfuncs.GetWindowCenterY() );
 	}
-
-	if ( gpGlobals && gpGlobals->time - s_flRawInputUpdateTime > 1.0f )
-	{
-		s_flRawInputUpdateTime = gpGlobals->time;
-		m_bRawInput = CVAR_GET_FLOAT( "m_rawinput" ) != 0;
-	}
 #endif
 }