[Scummvm-git-logs] scummvm master -> b7147fda30ad4ed5be4fdc79bd17387d05ebae8d
athrxx
noreply at scummvm.org
Tue Jul 2 20:30:11 UTC 2024
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:
b7147fda30 SCI: fix bug no. 15242
Commit: b7147fda30ad4ed5be4fdc79bd17387d05ebae8d
https://github.com/scummvm/scummvm/commit/b7147fda30ad4ed5be4fdc79bd17387d05ebae8d
Author: athrxx (athrxx at scummvm.org)
Date: 2024-07-02T22:14:06+02:00
Commit Message:
SCI: fix bug no. 15242
(regression from PR 5877)
Changed paths:
engines/sci/event.cpp
diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index f8f7b041447..87ba1fddfba 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -206,10 +206,11 @@ SciEvent EventManager::getScummVMEvent() {
found = em->pollEvent(ev);
} while (found && ev.type == Common::EVENT_MOUSEMOVE);
- Common::Point mousePos = g_sci->_gfxScreen->gfxDriver()->getMousePos();
+ Common::Point mousePos;
#if ENABLE_SCI32
if (getSciVersion() >= SCI_VERSION_2) {
+ mousePos = em->getMousePos();
const GfxFrameout *gfxFrameout = g_sci->_gfxFrameout;
// This will clamp `mousePos` according to the restricted zone,
@@ -226,6 +227,7 @@ SciEvent EventManager::getScummVMEvent() {
}
} else {
#endif
+ mousePos = g_sci->_gfxScreen->gfxDriver()->getMousePos();
g_sci->_gfxScreen->adjustBackUpscaledCoordinates(mousePos.y, mousePos.x);
#if ENABLE_SCI32
}
More information about the Scummvm-git-logs
mailing list