KYRA: (LOK) - fix mouse cursor bug (see #11303)

2 files changed, 14 insertions, 1 deletions

diff --git a/engines/kyra/engine/kyra_v1.cpp b/engines/kyra/engine/kyra_v1.cpp
index fc43919b57..c708756b19 100644
--- a/engines/kyra/engine/kyra_v1.cpp
+++ b/engines/kyra/engine/kyra_v1.cpp
@@ -235,6 +235,19 @@ void KyraEngine_v1::setMousePos(int x, int y) {
 		y <<= 1;
 	}
 	_system->warpMouse(x, y);
+
+	// Feed the event manager an artficial mouse move event, since warpMouse() won't generate one.
+	// From the warpMouse comments I gather that this behavior is intentional due to requirements of
+	// the SCUMM engine. In KYRA we need to get the same coordinates from _eventMan->getMousePos()
+	// that we send via warpMouse(). We have script situations in Kyra (like the Alchemists' crystals
+	// scene) where a new mouse cursor position is set and then immediately read. This function would
+	// then get wrong coordinates.
+	Common::Event event;
+	event.type = Common::EVENT_MOUSEMOVE;
+	event.mouse.x = x;
+	event.mouse.y = y;
+	_eventMan->pushEvent(event);
+	updateInput();
 }
 
 int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag) {
diff --git a/engines/kyra/script/script_v1.cpp b/engines/kyra/script/script_v1.cpp
index 2fbd2f22f4..356460dae0 100644
--- a/engines/kyra/script/script_v1.cpp
+++ b/engines/kyra/script/script_v1.cpp
@@ -65,7 +65,7 @@ int KyraEngine_v1::o1_showMouse(EMCState *script) {
 
 int KyraEngine_v1::o1_setMousePos(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setMousePos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
-	_system->warpMouse(stackPos(0), stackPos(1));
+	setMousePos(stackPos(0), stackPos(1));
 	return 0;
 }