diff options
| author | Eugene Sandulenko | 2016-11-15 19:19:46 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-11-15 19:19:46 +0100 |
| commit | 2b95164b785f18d97de8e668ed3339ab8c037392 (patch) | |
| tree | 4cc00bb4f99d18d594a58b1bfe672569f96a260f | |
| parent | 4e515ea3fed53f8390fa3a0776aee170e4be1b95 (diff) | |
| download | scummvm-rg350-2b95164b785f18d97de8e668ed3339ab8c037392.tar.gz scummvm-rg350-2b95164b785f18d97de8e668ed3339ab8c037392.tar.bz2 scummvm-rg350-2b95164b785f18d97de8e668ed3339ab8c037392.zip | |
DIRECTOR: FUrther work on cast loading in D4
| -rw-r--r-- | engines/director/archive.cpp | 1 | ||||
| -rw-r--r-- | engines/director/frame.cpp | 1 | ||||
| -rw-r--r-- | engines/director/score.cpp | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp index ff97d3fce1..5b1a26ffd4 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 cccfb375c8..de0de6d4d0 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 f145364882..819ae26830 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())); |