[Scummvm-git-logs] scummvm master -> 59b42b6ebede05b22b6e6f2dba99eef8ae5046bb

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
1b875f185f DIRECTOR: LINGO: Documented various events
59b42b6ebe DIRECTOR: LINGO: Kill sprite channel behavior instance only once


Commit: 1b875f185f62785c3cda8a56d9faa1b057c634c6
    https://github.com/scummvm/scummvm/commit/1b875f185f62785c3cda8a56d9faa1b057c634c6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-24T23:31:52+02:00

Commit Message:
DIRECTOR: LINGO: Documented various events

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 8b18b0e6505..3d7bd8943f9 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -41,19 +41,18 @@ struct EventHandlerType {
 	LEvent handler;
 	const char *name;
 } static const eventHandlerDescs[] = {
-	{ kEventPrepareMovie,		"prepareMovie" },
+	{ kEventPrepareMovie,		"prepareMovie" },		//					D6
 	{ kEventStartMovie,			"startMovie" },			//		D3
 	{ kEventStepMovie,			"stepMovie" },			//		D3
 	{ kEventStopMovie,			"stopMovie" },			//		D3
 
-	{ kEventNew,				"newSprite" },
-	{ kEventBeginSprite,		"beginSprite" },
-	{ kEventEndSprite,			"endSprite" },
+	{ kEventBeginSprite,		"beginSprite" },		//					D6
+	{ kEventEndSprite,			"endSprite" },			//					D6
 
 	{ kEventEnterFrame,			"enterFrame" },			//			D4
-	{ kEventPrepareFrame,		"prepareFrame" },
+	{ kEventPrepareFrame,		"prepareFrame" },		//					D6
 	{ kEventIdle,				"idle" },				//		D3
-	{ kEventStepFrame,			"stepFrame"},
+	{ kEventStepFrame,			"stepFrame"},			//				D5
 	{ kEventExitFrame,			"exitFrame" },			//			D4
 
 	{ kEventActivateWindow,		"activateWindow" },		//				D5
@@ -70,10 +69,10 @@ struct EventHandlerType {
 	{ kEventMouseDown,			"mouseDown" },			// D2 w	D3
 	{ kEventRightMouseDown,		"rightMouseDown" },		//				D5
 	{ kEventRightMouseUp,		"rightMouseUp" },		//				D5
-	{ kEventMouseEnter,			"mouseEnter" },
-	{ kEventMouseLeave,			"mouseLeave" },
-	{ kEventMouseUpOutSide,		"mouseUpOutSide" },
-	{ kEventMouseWithin,		"mouseWithin" },
+	{ kEventMouseEnter,			"mouseEnter" },			//				D5
+	{ kEventMouseLeave,			"mouseLeave" },			//				D5
+	{ kEventMouseUpOutSide,		"mouseUpOutSide" },		// 					D6-D7
+	{ kEventMouseWithin,		"mouseWithin" },		//				D5-D7
 
 	{ kEventTimeout,			"timeout" },			// D2 as when
 


Commit: 59b42b6ebede05b22b6e6f2dba99eef8ae5046bb
    https://github.com/scummvm/scummvm/commit/59b42b6ebede05b22b6e6f2dba99eef8ae5046bb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-24T23:32:10+02:00

Commit Message:
DIRECTOR: LINGO: Kill sprite channel behavior instance only once

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 3d7bd8943f9..e8969640786 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -695,11 +695,13 @@ void Score::killScriptInstances(int frameNum) {
 
 	if (frameNum < _currentFrame->_mainChannels.scriptSpriteInfo.startFrame ||
 	    frameNum > _currentFrame->_mainChannels.scriptSpriteInfo.endFrame) {
-		_scriptChannelScriptInstance = Datum();
-		debugC(1, kDebugLingoExec, "Score::killScriptInstances(): Killed script instances for script channel. frame %d [%d-%d]",
-			frameNum,
-			_currentFrame->_mainChannels.scriptSpriteInfo.startFrame,
-			_currentFrame->_mainChannels.scriptSpriteInfo.endFrame);
+		if (_scriptChannelScriptInstance.type == OBJECT) {
+			_scriptChannelScriptInstance = Datum();
+			debugC(1, kDebugLingoExec, "Score::killScriptInstances(): Killed script instances for script channel. frame %d [%d-%d]",
+				frameNum,
+				_currentFrame->_mainChannels.scriptSpriteInfo.startFrame,
+				_currentFrame->_mainChannels.scriptSpriteInfo.endFrame);
+		}
 	}
 
 	for (int i = 0; i < (int)_channels.size(); i++) {