[Scummvm-git-logs] scummvm master -> 2e7cee88f0d0f98b615f5b94498f79d7190e17d0

[djsrv]

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

Summary:
2e7cee88f0 DIRECTOR: LINGO: Fix sound loading in Warlock


Commit: 2e7cee88f0d0f98b615f5b94498f79d7190e17d0
    https://github.com/scummvm/scummvm/commit/2e7cee88f0d0f98b615f5b94498f79d7190e17d0
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-15T12:24:12-04:00

Commit Message:
DIRECTOR: LINGO: Fix sound loading in Warlock

Changed paths:
    engines/director/score-loading.cpp


diff --git a/engines/director/score-loading.cpp b/engines/director/score-loading.cpp
index 17b92468c9..9afbdc5433 100644
--- a/engines/director/score-loading.cpp
+++ b/engines/director/score-loading.cpp
@@ -386,7 +386,7 @@ void Score::loadSpriteSounds(bool isSharedCast) {
 			continue;
 
 		SoundCast *soundCast = (SoundCast *)c->_value;
-		uint32 tag = MKTAG('s', 'n', 'd', ' ');
+		uint32 tag = MKTAG('S', 'N', 'D', ' ');
 		uint16 sndId = (uint16)(c->_key + _castIDoffset);
 
 		if (_vm->getVersion() >= 4 && soundCast->_children.size() > 0) {
@@ -397,6 +397,12 @@ void Score::loadSpriteSounds(bool isSharedCast) {
 		Common::SeekableSubReadStreamEndian *sndData = NULL;
 
 		switch (tag) {
+		case MKTAG('S', 'N', 'D', ' '):
+			if (_movieArchive->hasResource(MKTAG('S', 'N', 'D', ' '), sndId)) {
+				debugC(2, kDebugLoading, "****** Loading 'SND ' id: %d", sndId);
+				sndData = _movieArchive->getResource(MKTAG('S', 'N', 'D', ' '), sndId);
+			}
+			break;
 		case MKTAG('s', 'n', 'd', ' '):
 			if (_movieArchive->hasResource(MKTAG('s', 'n', 'd', ' '), sndId)) {
 				debugC(2, kDebugLoading, "****** Loading 'snd ' id: %d", sndId);
@@ -664,6 +670,10 @@ void Score::loadCastDataVWCR(Common::SeekableSubReadStreamEndian &stream) {
 			debugC(3, kDebugLoading, "Score::loadCastDataVWCR(): CastTypes id: %d(%s) ButtonCast", id, numToCastNum(id));
 			_loadedCast->setVal(id, new TextCast(stream, _vm->getVersion(), true));
 			break;
+		case kCastSound:
+			debugC(3, kDebugLoading, "Score::loadCastDataVWCR(): CastTypes id: %d(%s) SoundCast", id, numToCastNum(id));
+			_loadedCast->setVal(id, new SoundCast(stream, _vm->getVersion()));
+			break;
 		default:
 			warning("Score::loadCastDataVWCR(): Unhandled cast id: %d(%s), type: %d, %d bytes", id, numToCastNum(id), castType, size);
 			stream.skip(size - 1);