diff options
Diffstat (limited to 'engines/director/score.cpp')
| -rw-r--r-- | engines/director/score.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/director/score.cpp b/engines/director/score.cpp index 0429e99d48..7b0642f1ce 100644 --- a/engines/director/score.cpp +++ b/engines/director/score.cpp @@ -140,7 +140,6 @@ void Score::loadArchive() { assert(_movieArchive->hasResource(MKTAG('V', 'W', 'S', 'C'), -1)); loadFrames(*_movieArchive->getFirstResource(MKTAG('V', 'W', 'S', 'C'))); - if (_movieArchive->hasResource(MKTAG('V', 'W', 'C', 'F'), -1)) { loadConfig(*_movieArchive->getFirstResource(MKTAG('V', 'W', 'C', 'F'))); } else { @@ -464,7 +463,7 @@ void Score::loadFrames(Common::SeekableSubReadStreamEndian &stream) { frame->readChannels(str); delete str; - debugC(3, kDebugLoading, "Frame %d actionId: %d", _frames.size(), frame->_actionId); + debugC(8, kDebugLoading, "Frame %d actionId: %d", _frames.size(), frame->_actionId); _frames.push_back(frame); } else { @@ -546,6 +545,9 @@ void Score::setSpriteCasts() { for (uint16 j = 0; j < _frames[i]->_sprites.size(); j++) { uint16 castId = _frames[i]->_sprites[j]->_castId; + if (castId == 0) + continue; + if (_vm->getSharedScore() != nullptr && _vm->getSharedScore()->_loadedBitmaps->contains(castId)) { _frames[i]->_sprites[j]->_bitmapCast = _vm->getSharedScore()->_loadedBitmaps->getVal(castId); } else if (_loadedBitmaps->contains(castId)) { |