[Scummvm-git-logs] scummvm master -> 44d8a71b617c588fdb71ab74ba6586fa0dbe1fab
sev-
noreply at scummvm.org
Sat Jul 4 08:25:22 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
44d8a71b61 DIRECTOR: LINGO: Improve 'the clickOn' behavior
Commit: 44d8a71b617c588fdb71ab74ba6586fa0dbe1fab
https://github.com/scummvm/scummvm/commit/44d8a71b617c588fdb71ab74ba6586fa0dbe1fab
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-07-04T10:25:09+02:00
Commit Message:
DIRECTOR: LINGO: Improve 'the clickOn' behavior
It also reacts to mouseUp and keeps the mouseDown sprite when
mouseUp is on score.
Also, consistently use the proper spriteId
Changed paths:
engines/director/lingo/lingo-events.cpp
diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index 2304a3c8a52..37e4bb8a111 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -134,8 +134,14 @@ void Movie::resolveScriptEvent(LingoEvent &event) {
else
spriteId = _score->getMouseSpriteIDFromPos(event.mousePos);
- if (event.event == kEventMouseDown || event.event == kEventRightMouseDown)
- _lastClickedSpriteId = _score->getActiveSpriteIDFromPos(event.mousePos); // the clickOn
+ if (event.event == kEventMouseDown || event.event == kEventRightMouseDown) {
+ _lastClickedSpriteId = spriteId; // the clickOn
+ } else if (event.event == kEventMouseUp || event.event == kEventRightMouseUp) {
+ // Do not override when clicked on Score
+ if (spriteId)
+ _lastClickedSpriteId = spriteId;
+ }
+
}
// Very occasionally, we want to specify an event with a channel ID
// rather than infer it from the position. Allow it to override.
More information about the Scummvm-git-logs
mailing list