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

[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:
d574f5bd06 DIRECTOR: LINGO: Dispatch prepareFrame to the frame and movie scripts


Commit: d574f5bd06b0b4c60b2cf6f4cdf6cbbab2a33868
    https://github.com/scummvm/scummvm/commit/d574f5bd06b0b4c60b2cf6f4cdf6cbbab2a33868
Author: Gianluca Boiano (morf3089 at gmail.com)
Date: 2026-07-25T13:19:08+02:00

Commit Message:
DIRECTOR: LINGO: Dispatch prepareFrame to the frame and movie scripts

Sprite behaviors are independent recipients of a broadcast event, so the
last behavior marking it handled must not swallow the frame and movie
handlers sharing its event id.

Fixes dead scene navigation (_AktSeite never set) in physicus (Game/SLand.dxr, Game/GSteuer.cxt BehaviorScript 7)

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 e5003b0cfdb..e005916a8fd 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -449,12 +449,14 @@ void Movie::queueEvent(Common::Queue<LingoEvent> &queue, LEvent event, int targe
 	uint16 channelId = 0;
 	uint16 pointedSpriteId = 0;
 
-	// In D6+ there are multiple behavors per sprite, find the sprite
+	// In D6+ there are multiple behavors per sprite, find the sprite.
+	// prepareFrame is broadcast per channel, so for it targetId 0 means
+	// "no sprite" rather than "whatever is under the mouse".
 	if (g_director->getVersion() >= 600) {
-		if (targetId == 0) {
-			pointedSpriteId = _score->getMouseSpriteIDFromPos(pos);
-		} else {
+		if (targetId != 0) {
 			pointedSpriteId = targetId;
+		} else if (event != kEventPrepareFrame) {
+			pointedSpriteId = _score->getMouseSpriteIDFromPos(pos);
 		}
 	}
 
@@ -615,7 +617,8 @@ void Movie::queueEvent(Common::Queue<LingoEvent> &queue, LEvent event, int targe
 						queue.push(LingoEvent(event, eventId, kSpriteHandler, passThrough, pos, pointedSpriteId, i));
 					}
 
-					if (event == kEventBeginSprite || event == kEventEndSprite || event == kEventMouseUpOutSide) {
+					if (event == kEventBeginSprite || event == kEventEndSprite || event == kEventMouseUpOutSide
+							|| event == kEventPrepareFrame) {
 						// These events do not go any further than the sprite behaviors
 						break;
 					}
@@ -698,11 +701,9 @@ void Movie::broadcastEvent(LEvent event) {
 		}
 	}
 
-	// With no sprite behaviors, cast/frame/movie handlers were never queued
-	// at all; add a no-target pass. When behaviors exist, their pass()
-	// semantics already decide whether those handlers run.
-	if (queue.empty())
-		queueEvent(queue, event, 0);
+	// Each sprite is an independent recipient; the frame and movie scripts get
+	// the event exactly once, after every behavior.
+	queueEvent(queue, event, 0);
 
 	_vm->setCurrentWindow(this->getWindow());
 	_lingo->processEvents(queue, false);