libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 03:10:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
athrxx 2020-01-08 19:36:31 +01:00
parent ec872b8dc8
commit 24d0159e79
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engines/kyra/engine/kyra_v1.cpp
View File

@ -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) {

2
engines/kyra/script/script_v1.cpp
View File

@ -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;
}