[Scummvm-git-logs] scummvm master -> 580f3875c099f78790453ba703414cf1ef71f412

[csnover]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
580f3875c0 SCI32: Fix explicit mouse position changes


Commit: 580f3875c099f78790453ba703414cf1ef71f412
    https://github.com/scummvm/scummvm/commit/580f3875c099f78790453ba703414cf1ef71f412
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-07-23T11:42:55-05:00

Commit Message:
SCI32: Fix explicit mouse position changes

This was broken by 9f33f2b3df22a26314dbb74173f49bc930c7a1f9.

Changed paths:
    engines/sci/graphics/cursor32.cpp


diff --git a/engines/sci/graphics/cursor32.cpp b/engines/sci/graphics/cursor32.cpp
index feb62ee..b374e9d 100644
--- a/engines/sci/graphics/cursor32.cpp
+++ b/engines/sci/graphics/cursor32.cpp
@@ -338,10 +338,12 @@ void GfxCursor32::setPosition(const Common::Point &position) {
 	const int16 screenWidth = g_sci->_gfxFrameout->getCurrentBuffer().screenWidth;
 	const int16 screenHeight = g_sci->_gfxFrameout->getCurrentBuffer().screenHeight;
 
-	_position.x = (position.x * Ratio(screenWidth, scriptWidth)).toInt();
-	_position.y = (position.y * Ratio(screenHeight, scriptHeight)).toInt();
+	Common::Point newPosition;
+	newPosition.x = (position.x * Ratio(screenWidth, scriptWidth)).toInt();
+	newPosition.y = (position.y * Ratio(screenHeight, scriptHeight)).toInt();
 
-	g_system->warpMouse(_position.x, _position.y);
+	g_system->warpMouse(newPosition.x, newPosition.y);
+	deviceMoved(newPosition);
 }
 
 void GfxCursor32::gonnaPaint(Common::Rect paintRect) {