Fix cursor restoring behavior

multitheftauto · Mar 11, 2017 · d6474bc · d6474bc
1 parent 050a11e
commit d6474bc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Client/core/CGUI.cpp b/Client/core/CGUI.cpp
@@ -761,8 +761,15 @@ void CLocalGUI::UpdateCursor ( void )
             CCore::GetSingleton ().GetGame ()->GetPad ()->Disable ( false );
             CCore::GetSingleton ().GetGame ()->GetPad ()->Clear ();*/
 
+            // Update stored position
+            POINT point;
+            GetCursorPos(&point);
+
+            m_StoredMousePosition.x = point.x;
+            m_StoredMousePosition.y = point.y;
+
             // Set the mouse back to the center of the screen (to prevent the game from reacting to its movement)
-            SetCursorPos ( dwWidth / 2, dwHeight / 2 );
+            SetCursorPos ( dwWidth / 2, dwHeight / 2, false, false );
 
             // Disable our mouse cursor
             CSetCursorPosHook::GetSingleton ( ).EnableSetCursorPos ();
@@ -806,11 +813,14 @@ DWORD CLocalGUI::TranslateScanCodeToGUIKey ( DWORD dwCharacter )
     }
 }
 
-void CLocalGUI::SetCursorPos ( int iX, int iY, bool bForce )
+void CLocalGUI::SetCursorPos ( int iX, int iY, bool bForce, bool overrideStored )
 {
     // Update the stored position
-    m_StoredMousePosition.x = iX;
-    m_StoredMousePosition.y = iY;
+    if (overrideStored)
+    {
+        m_StoredMousePosition.x = iX;
+        m_StoredMousePosition.y = iY;
+    }
 
     // Apply the position
     if ( bForce )

diff --git a/Client/core/CGUI.h b/Client/core/CGUI.h
@@ -61,7 +61,7 @@ class CLocalGUI : public CSingleton < CLocalGUI >
     void                Restore                     ( void );
 
     void                DrawMouseCursor             ( void );
-    void                SetCursorPos                ( int iX, int iY, bool bForce = false );
+    void                SetCursorPos                ( int iX, int iY, bool bForce = false, bool overrideStored = true );
 
     CConsole*           GetConsole                  ( void );
     void                SetConsoleVisible           ( bool bVisible );