[Scummvm-git-logs] scummvm master -> 32091910a7b9f4dc91099c7b931f6b9826a85c4a

[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:
1ee9f09689 DIRECTOR: Implement eventHandlerSourceType2str()
32091910a7 DIRECTOR: LINGO: Added tracing debug output to event enqueueing


Commit: 1ee9f09689b3facdb6e6976a42a0fe116da23b52
    https://github.com/scummvm/scummvm/commit/1ee9f09689b3facdb6e6976a42a0fe116da23b52
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-07-06T23:09:15+02:00

Commit Message:
DIRECTOR: Implement eventHandlerSourceType2str()

Changed paths:
    engines/director/types.cpp
    engines/director/types.h


diff --git a/engines/director/types.cpp b/engines/director/types.cpp
index b7d1f316d1d..07ba17faef4 100644
--- a/engines/director/types.cpp
+++ b/engines/director/types.cpp
@@ -218,6 +218,23 @@ const char *leventType2str(LEvent type) {
 	return "<unknown>";
 }
 
+const char *const eventHandlerSourceType[] = {
+	"NoneHandler",
+	"PrimaryHandler",
+	"SpriteHandler",
+	"CastHandler",
+	"FrameHandler",
+	"MovieHandler",
+};
+
+const char *eventHandlerSourceType2str(EventHandlerSourceType type) {
+	if (type <= kMovieHandler)
+		return eventHandlerSourceType[type];
+
+	warning("BUILDBOT: Unknown EventHandlerSourceType: %d", type);
+	return "<unknown>";
+}
+
 #define defFlag(x) { x, #x }
 
 struct FlagsList {
diff --git a/engines/director/types.h b/engines/director/types.h
index 26a5a7cae39..1a28d531656 100644
--- a/engines/director/types.h
+++ b/engines/director/types.h
@@ -480,6 +480,7 @@ const char *spriteType2str(SpriteType type);
 const char *inkType2str(InkType type);
 const char *symbolType2str(SymbolType type);
 const char *leventType2str(LEvent type);
+const char *eventHandlerSourceType2str(EventHandlerSourceType type);
 Common::String objectType2str(int fl);
 Common::String paletteType2str(PaletteType value);
 Common::String textAlignType2str(TextAlignType value);


Commit: 32091910a7b9f4dc91099c7b931f6b9826a85c4a
    https://github.com/scummvm/scummvm/commit/32091910a7b9f4dc91099c7b931f6b9826a85c4a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-07-06T23:09:22+02:00

Commit Message:
DIRECTOR: LINGO: Added tracing debug output to event enqueueing

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


diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index 743d525c964..257b390c3ed 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -134,7 +134,9 @@ void Movie::resolveScriptEvent(LingoEvent &event) {
 		else
 			spriteId = _score->getMouseSpriteIDFromPos(event.mousePos);
 
-		debugC(3, kDebugEvents, "Movie::resolveScriptEvent(%s): pos: [%d, %d], spriteId: %d", leventType2str(event.event), event.mousePos.x, event.mousePos.y, spriteId);
+		debugC(3, kDebugEvents, "Movie::resolveScriptEvent(%s): id: %d sourceType: %s, handlerType: %s, pos: [%d, %d], spriteId: %d",
+			leventType2str(event.event), event.eventId, scriptType2str(event.scriptType),
+			eventHandlerSourceType2str(event.eventHandlerSourceType), event.mousePos.x, event.mousePos.y, spriteId);
 
 		if (event.event == kEventMouseDown || event.event == kEventRightMouseDown) {
 			_lastClickedSpriteId = spriteId; // the clickOn
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index e03bc6ec9d7..bd168706e5b 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -289,6 +289,9 @@ struct LingoEvent {
 		mousePos = mp;
 		behaviorIndex = bi;
 		scriptInstance = nullptr;
+
+		debugC(7, kDebugEvents, "LingoEvent: event=%s, eventId=%d, scriptType=%d, passByDefault=%d, scriptId=(%d,%d), mousePos=(%d,%d), behaviorIndex=%d",
+			leventType2str(event), eventId, scriptType, passByDefault, scriptId.member, scriptId.castLib, mousePos.x, mousePos.y, behaviorIndex);
 	}
 
 	LingoEvent(LEvent e, int ei, EventHandlerSourceType ehst, bool pass, Common::Point mp = Common::Point(-1, -1), uint16 ci = 0, int bi = -1) {
@@ -302,6 +305,9 @@ struct LingoEvent {
 		mousePos = mp;
 		behaviorIndex = bi;
 		scriptInstance = nullptr;
+
+		debugC(7, kDebugEvents, "LingoEvent: event=%s, eventId=%d, eventHandlerSourceType=%s, passByDefault=%d, channelId=%d, mousePos=(%d,%d), behaviorIndex=%d",
+			leventType2str(event), eventId, eventHandlerSourceType2str(eventHandlerSourceType), passByDefault, channelId, mousePos.x, mousePos.y, behaviorIndex);
 	}
 };
 
diff --git a/engines/director/types.cpp b/engines/director/types.cpp
index 07ba17faef4..b61adb7ded1 100644
--- a/engines/director/types.cpp
+++ b/engines/director/types.cpp
@@ -199,7 +199,7 @@ const char *const leventType[] = {
 	"mouseUpOutSide",
 	"mouseWithin",
 
-	"atartUp",
+	"startUp",
 
 	"menuCallback",