diff options
| author | Eugene Sandulenko | 2017-04-05 19:38:44 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-04-05 19:38:44 +0200 |
| commit | 497cd988381a46c2efe24ae9d0f33edbefb300d9 (patch) | |
| tree | 1d9ad6f281b3bf1b45707016b73cc880e00795a3 | |
| parent | 0a2786164e9ce9eca876d616a2781b6867ac42e6 (diff) | |
| download | scummvm-rg350-497cd988381a46c2efe24ae9d0f33edbefb300d9.tar.gz scummvm-rg350-497cd988381a46c2efe24ae9d0f33edbefb300d9.tar.bz2 scummvm-rg350-497cd988381a46c2efe24ae9d0f33edbefb300d9.zip | |
DIRECTOR: Fix warnings
| -rw-r--r-- | engines/director/score.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/director/score.cpp b/engines/director/score.cpp index 9861e1efb7..38f5ba6a67 100644 --- a/engines/director/score.cpp +++ b/engines/director/score.cpp @@ -131,7 +131,7 @@ void Score::loadArchive() { assert(_movieArchive->hasResource(MKTAG('V', 'W', 'S', 'C'), 1024)); loadFrames(*_movieArchive->getResource(MKTAG('V', 'W', 'S', 'C'), 1024)); - + if (_movieArchive->hasResource(MKTAG('V', 'W', 'C', 'F'), -1)) { loadConfig(*_movieArchive->getResource(MKTAG('V', 'W', 'C', 'F'), 1024)); @@ -323,6 +323,8 @@ void Score::loadFrames(Common::SeekableSubReadStreamEndian &stream) { uint16 unk4 = stream.readUint16(); uint16 unk5 = stream.readUint16(); uint16 unk6 = stream.readUint16(); + + warning("STUB: Score::loadFrames. unk1: %x unk2: %x unk3: %x unk4: %x unk5: %x unk6: %x", unk1, unk2, unk3, unk4, unk5, unk6); } uint16 channelSize; @@ -455,7 +457,7 @@ void Score::setSpriteCasts() { if (_vm->getSharedScore()->_loadedButtons->contains(castId)) { _frames[i]->_sprites[j]->_buttonCast = _vm->getSharedScore()->_loadedButtons->getVal(castId); if (_frames[i]->_sprites[j]->_buttonCast->children.size() == 1) { - _frames[i]->_sprites[j]->_textCast = + _frames[i]->_sprites[j]->_textCast = _vm->getSharedScore()->_loadedText->getVal(_frames[i]->_sprites[j]->_buttonCast->children[0].index); } else if (_frames[i]->_sprites[j]->_buttonCast->children.size() > 0) { warning("Cast %d has too many children!", j); @@ -525,6 +527,8 @@ void Score::loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id, size1 = stream.readUint32() - 4; // assert(size1 == 0x14); // size1 = 0; + } else { + error("Score::loadCastData: unsupported Director version (%d)", _vm->getVersion()); } debugC(3, kDebugLoading, "CASt: id: %d type: %x size1: %d size2: %d (%x) size3: %d unk1: %d unk2: %d unk3: %d", |