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

[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:
7b69fd4aa0 DIRECTOR: LINGO: Print movie path and call stack when error occurs with lingostrict
a96106324b DIRECTOR: Dump scripts into subdirectories after movie location


Commit: 7b69fd4aa04595d8301d1ca2a793d3bd0a98d20f
    https://github.com/scummvm/scummvm/commit/7b69fd4aa04595d8301d1ca2a793d3bd0a98d20f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-05-12T23:42:16+02:00

Commit Message:
DIRECTOR: LINGO: Print movie path and call stack when error occurs with lingostrict

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


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index e185a8f48e0..6ef78f733c0 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -783,6 +783,9 @@ void Lingo::lingoError(const char *s, ...) {
 		_caughtError = true;
 	} else {
 		warning("BUILDBOT: Uncaught Lingo error: %s", buf);
+		debug("Movie: %s", _vm->getCurrentMovie()->getArchive()->getPathName().toString(Common::Path::kNativeSeparator).c_str());
+		debugN("%s", formatCallStack(_state->pc).c_str());
+
 		if (debugChannelSet(-1, kDebugLingoStrict)) {
 			error("Uncaught Lingo error");
 		}


Commit: a96106324be8cae31a19577e1a4e1ec5f55f8fc4
    https://github.com/scummvm/scummvm/commit/a96106324be8cae31a19577e1a4e1ec5f55f8fc4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-05-12T23:42:21+02:00

Commit Message:
DIRECTOR: Dump scripts into subdirectories after movie location

Helps with understanding which scripts belong to which movies,
particularly with the shared scripts

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 2e09762116e..27bba9a6f27 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -1768,7 +1768,8 @@ void Cast::loadLingoContext(Common::SeekableReadStreamEndian &stream) {
 				debugC(1, kDebugCompile, "Cast::loadLingoContext: Script %d is used but empty", i);
 				continue;
 			}
-			_lingoArchive->addCodeV4(*(r = _castArchive->getResource(MKTAG('L', 's', 'c', 'r'), entry.index)), i, _macName, _version);
+			_lingoArchive->addCodeV4(*(r = _castArchive->getResource(MKTAG('L', 's', 'c', 'r'), entry.index)), i,
+					getArchive()->getPathName().toString(g_director->_dirSeparator), _version);
 			delete r;
 		}
 
@@ -1816,7 +1817,7 @@ void Cast::loadLingoContext(Common::SeekableReadStreamEndian &stream) {
 					scriptType = kCastScript;
 				}
 
-				Common::String filename = encodePathForDump(_macName);
+				Common::String filename = encodePathForDump(getArchive()->getPathName().toString(g_director->_dirSeparator));
 				Common::Path lingoPath(dumpScriptName(filename.c_str(), scriptType, _castsScriptIds[it->first], "lingo"));
 
 				if (out.open(lingoPath, true)) {