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

[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:
23e27dc4a0 DIRECTOR: Remove leftover debug message
d2e56053f0 DIRECTOR: Dump RIFF resources when requested


Commit: 23e27dc4a0850051fed3f39c373951ae934504b0
    https://github.com/scummvm/scummvm/commit/23e27dc4a0850051fed3f39c373951ae934504b0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-01-26T12:30:30+01:00

Commit Message:
DIRECTOR: Remove leftover debug message

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 82dd3dadb42..3b45d0394a8 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -772,8 +772,6 @@ void Cast::loadSoundData(int key, SoundCastMember *soundCast) {
 		if (!_castsInfo[key]->directory.empty())
 			filename = _castsInfo[key]->directory + g_director->_dirSeparator + _castsInfo[key]->fileName;
 
-		warning("Filename is: %s", filename.c_str());
-
 		AudioFileDecoder *audio = new AudioFileDecoder(filename);
 		soundCast->_audio = audio;
 	} else {


Commit: d2e56053f0339a638cd2802de4e1d89d17f6409e
    https://github.com/scummvm/scummvm/commit/d2e56053f0339a638cd2802de4e1d89d17f6409e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-01-26T12:52:52+01:00

Commit Message:
DIRECTOR: Dump RIFF resources when requested

Changed paths:
    engines/director/archive.cpp


diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index c575b30c766..d47bbe3ea23 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -383,6 +383,10 @@ bool RIFFArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
 	uint32 startPos = stream->pos();
 	stream->readUint32LE(); // unknown (always 0?)
 
+	Common::DumpFile out;
+
+	_stream = stream;
+
 	while ((uint32)stream->pos() < startPos + cftcSize) {
 		uint32 tag = convertTagToUppercase(stream->readUint32BE());
 
@@ -412,19 +416,21 @@ bool RIFFArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
 			}
 		}
 
-		stream->seek(startResPos);
-
 		debug(3, "Found RIFF resource '%s' %d: %d @ 0x%08x (0x%08x)", tag2str(tag), id, size, offset, startOffset + offset);
 
-		ResourceMap &resMap = _types[tag];
-		Resource &res = resMap[id];
+		Resource &res = _types[tag][id];
+		res.index = id;
 		res.offset = offset;
 		res.size = size;
 		res.name = name;
 		res.tag = tag;
+
+		if (ConfMan.getBool("dump_scripts"))
+			dumpChunk(res, out);
+
+		stream->seek(startResPos);
 	}
 
-	_stream = stream;
 	return true;
 }