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

[sev-]

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:
2b95164b78 DIRECTOR: FUrther work on cast loading in D4


Commit: 2b95164b785f18d97de8e668ed3339ab8c037392
    https://github.com/scummvm/scummvm/commit/2b95164b785f18d97de8e668ed3339ab8c037392
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-15T19:19:46+01:00

Commit Message:
DIRECTOR: FUrther work on cast loading in D4

Changed paths:
    engines/director/archive.cpp
    engines/director/frame.cpp
    engines/director/score.cpp



diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index ff97d3f..5b1a26f 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -447,6 +447,7 @@ bool RIFXArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
 		const Resource &res = resources[index];
 		debug(3, "Found RIFX resource: '%s' id: 0x%04x, %d @ 0x%08x (%d)", tag2str(resTag), id, res.size, res.offset, res.offset);
 		_types[resTag][id] = res;
+		_types[resTag][1024 + i + 1] = res;
 	}
 
 	_stream = stream;
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index cccfb37..de0de6d 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -648,7 +648,6 @@ Image::ImageDecoder *Frame::getImageFrom(uint16 spriteId) {
 	}
 
 	if (_vm->_currentScore->getArchive()->hasResource(MKTAG('B', 'I', 'T', 'D'), imgId)) {
-		warning("************");
 		Common::SeekableReadStream *pic = _vm->_currentScore->getArchive()->getResource(MKTAG('B', 'I', 'T', 'D'), imgId);
 
 		if (_vm->getVersion() <= 4) {
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index f145364..819ae26 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -220,6 +220,8 @@ void Score::loadArchive() {
 			loadCastData(*_movieArchive->getResource(MKTAG('C','A','S','t'), *iterator), *iterator);
 	}
 
+	setSpriteCasts();
+
 	Common::Array<uint16> stxt = _movieArchive->getResourceIDList(MKTAG('S','T','X','T'));
 	if (stxt.size() > 0) {
 		loadScriptText(*_movieArchive->getResource(MKTAG('S','T','X','T'), *stxt.begin()));