[Scummvm-git-logs] scummvm master -> 749f811789a8d4fdc6db8ded1a4f1e2b7eba0e72

[sev-]

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

Summary:
37ba8b175c DIRECTOR: Added more debug output when loading score
6801c993de DIRECTOR: Added more debug output on archive loading
749f811789 DIRECTOR: Added VW/VW2/D1 targets to detection


Commit: 37ba8b175c867501c87a7cb42ed3a5f3df32d5e1
    https://github.com/scummvm/scummvm/commit/37ba8b175c867501c87a7cb42ed3a5f3df32d5e1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-06-03T14:00:07+02:00

Commit Message:
DIRECTOR: Added more debug output when loading score

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index e5c087b9ea3..b3718cbdf09 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1602,7 +1602,8 @@ void Score::loadFrames(Common::SeekableReadStreamEndian &stream, uint16 version)
 	_firstFramePosition = _framesStream->pos();
 
 	// Pre-computing number of frames, as sometimes the frameNumber in stream mismatches
-	debugC(1, kDebugLoading, "Score::loadFrames(): Precomputing total number of frames!");
+	debugC(1, kDebugLoading, "Score::loadFrames(): Precomputing total number of frames! First frame pos: %d, framesstreamsizeL %d",
+			_firstFramePosition, _framesStreamSize);
 
 	// Calculate number of frames and their positions
 	// numOfFrames in the header is often incorrect
@@ -1671,6 +1672,7 @@ bool Score::readOneFrame() {
 		return false;
 
 	uint16 frameSize = _framesStream->readUint16();
+	debugC(4, kDebugLoading, "pos: %ld frameSize: %d (0x%x) streamSize: %d", _framesStream->pos() - 2, frameSize, frameSize, _framesStreamSize);
 	assert(frameSize < _framesStreamSize);
 
 	debugC(3, kDebugLoading, "++++++++++ score load frame %d (frameSize %d) saveOffset", _curFrameNumber, frameSize);


Commit: 6801c993dea57342d02763405256c813c35fa2cb
    https://github.com/scummvm/scummvm/commit/6801c993dea57342d02763405256c813c35fa2cb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-06-03T14:00:11+02:00

Commit Message:
DIRECTOR: Added more debug output on archive loading

Changed paths:
    engines/director/archive.cpp


diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index 47407f031ff..37f7bd6f4d3 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -437,20 +437,25 @@ bool RIFFArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
 
 	_stream = stream;
 
-	if (convertTagToUppercase(stream->readUint32BE()) != MKTAG('R', 'I', 'F', 'F')) {
-		debugC(5, kDebugLoading, "RIFFArchive::openStream(): RIFF expected but not found");
+	uint32 tag = stream->readUint32BE();
+
+	if (convertTagToUppercase(tag) != MKTAG('R', 'I', 'F', 'F')) {
+		debugC(5, kDebugLoading, "RIFFArchive::openStream(): RIFF expected but got '%s'", tag2str(tag));
 		return false;
 	}
 
 	stream->readUint32LE(); // size
 
-	if (convertTagToUppercase(stream->readUint32BE()) != MKTAG('R', 'M', 'M', 'P')) {
-		debugC(5, kDebugLoading, "RIFFArchive::openStream(): RMMP expected but not found");
+	tag = stream->readUint32BE();
+
+	if (convertTagToUppercase(tag) != MKTAG('R', 'M', 'M', 'P')) {
+		debugC(5, kDebugLoading, "RIFFArchive::openStream(): RMMP expected but  got '%s'", tag2str(tag));
 		return false;
 	}
 
-	if (convertTagToUppercase(stream->readUint32BE()) != MKTAG('C', 'F', 'T', 'C')) {
-		debugC(5, kDebugLoading, "RIFFArchive::openStream(): CFTC expected but not found");
+	tag = stream->readUint32BE();
+	if (convertTagToUppercase(tag) != MKTAG('C', 'F', 'T', 'C')) {
+		debugC(5, kDebugLoading, "RIFFArchive::openStream(): CFTC expected but  got '%s'", tag2str(tag));
 		return false;
 	}
 
@@ -461,7 +466,7 @@ bool RIFFArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
 	Common::DumpFile out;
 
 	while ((uint32)stream->pos() < startPos + cftcSize) {
-		uint32 tag = convertTagToUppercase(stream->readUint32BE());
+		tag = convertTagToUppercase(stream->readUint32BE());
 
 		uint32 size = stream->readUint32LE();
 		uint32 id = stream->readUint32LE();


Commit: 749f811789a8d4fdc6db8ded1a4f1e2b7eba0e72
    https://github.com/scummvm/scummvm/commit/749f811789a8d4fdc6db8ded1a4f1e2b7eba0e72
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-06-03T14:00:11+02:00

Commit Message:
DIRECTOR: Added VW/VW2/D1 targets to detection

Changed paths:
    engines/director/detection.cpp


diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index e91a37ac99b..a73c82815e8 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -38,6 +38,9 @@ static const struct CustomTarget {
 	const char *platform;
 	const char *version;
 } customTargetList[] = {
+	{"vw-mac", "mac", "000" },
+	{"vw2-mac", "mac", "050" },
+	{"d1-mac", "mac", "100" },
 	{"d2-mac", "mac", "200" },
 	{"d3-mac", "mac", "300" },
 	{"d4-mac", "mac", "400" },