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

[sev-]

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

Summary:
170c1d0ffc DIRECTOR: Dump built-in movie files if requested
f352a3e1cc DIRECTOR: Improved loading log messages


Commit: 170c1d0ffcf6722002935505108fe9a91cbe9ccf
    https://github.com/scummvm/scummvm/commit/170c1d0ffcf6722002935505108fe9a91cbe9ccf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-24T01:11:31+02:00

Commit Message:
DIRECTOR: Dump built-in movie files if requested

Changed paths:
    engines/director/resource.cpp


diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index a1166dae05c..80544110fac 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -76,6 +76,10 @@ Common::Error Window::loadInitialMovie() {
 	if (multiArchive->isLoaded()) {
 		// A valid projector archive, add to SearchMan
 		SearchMan.add(_vm->getRawEXEName(), multiArchive);
+
+		if (ConfMan.getBool("dump_scripts"))
+			multiArchive->dumpArchive(Common::Path("./dumps").join(encodePathForDump(movie)));
+
 	} else {
 		delete multiArchive;
 	}


Commit: f352a3e1cce90cf09a05d45f3f199923bcd0f078
    https://github.com/scummvm/scummvm/commit/f352a3e1cce90cf09a05d45f3f199923bcd0f078
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-24T01:11:31+02:00

Commit Message:
DIRECTOR: Improved loading log messages

Changed paths:
    engines/director/archive.cpp
    engines/director/resource.cpp


diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index 275043d1d1c..47407f031ff 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -785,7 +785,7 @@ bool RIFXArchive::readMemoryMap(Common::SeekableReadStreamEndian &stream, uint32
 			dumpStream->writeUint32LE(mmapOffset - movieStartOffset);
 	}
 	uint32 version = stream.readUint32(); // 0 for 4.0, 0x4c1 for 5.0, 0x4c7 for 6.0, 0x708 for 8.5, 0x742 for 10.0
-	warning("mmap: version: %x", version);
+	warning("mmap: version: %x offset: 0x%x (%d)", version, mmapOffset, mmapOffset);
 
 	stream.seek(mmapOffset);
 
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index 80544110fac..6d95a1f459c 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -656,7 +656,7 @@ bool ProjectorArchive::loadArchive(Common::SeekableReadStream *stream) {
 	stream->seek(rifxOffset);
 	tag = stream->readUint32BE();
 
-	debugC(1, kDebugLoading, "File: %s off: 0x%x, tag: %s rifx: 0x%x", _path.toString().c_str(), off, tag2str(tag), rifxOffset);
+	debugC(1, kDebugLoading, "File: %s off: 0x%x (%u), tag: %s rifx: 0x%x (%d)", _path.toString().c_str(), off, off, tag2str(tag), rifxOffset, rifxOffset);
 
 	// Try to locate the very next Dict tag(byte-by-byte)
 	tag = stream->readUint32BE();
@@ -744,7 +744,7 @@ bool ProjectorArchive::loadArchive(Common::SeekableReadStream *stream) {
 
 		Common::Path path = toSafePath(arr[i]);
 
-		debugC(1, kDebugLoading, "Entry: %s offset %lX tag %s size %d", path.toString().c_str(), long(stream->pos() - 8), tag2str(tag), size);
+		debugC(1, kDebugLoading, "Entry: %s offset %lX (%ld) tag %s size %d", path.toString().c_str(), long(stream->pos() - 8), long(stream->pos() - 8), tag2str(tag), size);
 
 		Entry entry;