[Scummvm-git-logs] scummvm master -> cdad826b5ee871c8b9add722a996227a6907cdb1

[sev-]

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:
cdad826b5e DIRECTOR: LINGO: Fix regression about `clickOn`


Commit: cdad826b5ee871c8b9add722a996227a6907cdb1
    https://github.com/scummvm/scummvm/commit/cdad826b5ee871c8b9add722a996227a6907cdb1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-07T01:05:51+02:00

Commit Message:
DIRECTOR: LINGO: Fix regression about `clickOn`

Introduced in 02b3aef3c37746583ac8dd3ad9bd87bfcc7323b2. We are
losing spriteId Movie::processEvent(), it is always 0.

Fixes pip-up window (like Open) in simpsonsstudio

Changed paths:
    engines/director/events.cpp
    engines/director/lingo/lingo-events.cpp


diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index 713579efd16..9983b921608 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -234,8 +234,6 @@ bool Movie::processEvent(Common::Event &event) {
 				}
 			}
 
-			_lastClickedSpriteId = spriteId; // for 'the clickOn'
-
 			// FIXME: Check if these are tracked with the right mouse button
 			_lastEventTime = g_director->getMacTicks();
 			_lastClickTime2 = _lastClickTime;
diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index 65348fa30f8..9943a52b3aa 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -128,6 +128,9 @@ void Movie::resolveScriptEvent(LingoEvent &event) {
 			spriteId = _score->getActiveSpriteIDFromPos(event.mousePos);
 		else
 			spriteId = _score->getMouseSpriteIDFromPos(event.mousePos);
+
+		if (event.event == kEventMouseDown || event.event == kEventRightMouseDown)
+			_lastClickedSpriteId = _score->getActiveSpriteIDFromPos(event.mousePos); // the clickOn
 	}
 	// Very occasionally, we want to specify an event with a channel ID
 	// rather than infer it from the position. Allow it to override.