[Scummvm-cvs-logs] scummvm master -> 287391d1d5fa15261c817af567c67296d022cb8f

[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:
287391d1d5 SCI32: Fix incorrect mouse event coordinates in SCI2 hires


Commit: 287391d1d5fa15261c817af567c67296d022cb8f
    https://github.com/scummvm/scummvm/commit/287391d1d5fa15261c817af567c67296d022cb8f
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-03-11T19:05:13-06:00

Commit Message:
SCI32: Fix incorrect mouse event coordinates in SCI2 hires

Changed paths:
    engines/sci/engine/kevent.cpp



diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index 2543421..534d9ce 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -83,11 +83,12 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) {
 	}
 
 	// For a real event we use its associated mouse position
-	mousePos = curEvent.mousePos;
 #ifdef ENABLE_SCI32
-	if (getSciVersion() >= SCI_VERSION_2_1_EARLY)
-		g_sci->_gfxCoordAdjuster->fromDisplayToScript(mousePos.y, mousePos.x);
+	if (getSciVersion() >= SCI_VERSION_2)
+		mousePos = curEvent.mousePosSci;
+	else
 #endif
+		mousePos = curEvent.mousePos;
 	// Limit the mouse cursor position, if necessary
 	g_sci->_gfxCursor->refreshPosition();