diff options
| author | Eugene Sandulenko | 2016-08-30 18:21:34 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-08-30 18:21:34 +0200 |
| commit | fe22b8bd0e70839a001e0c91e9e598faa36e724b (patch) | |
| tree | a698af6fe3db548d9f8cc905b24a7d20c16f5490 /engines/director/score.cpp | |
| parent | 6d3e772897a9fad59899e41e289720c1945a958a (diff) | |
| download | scummvm-rg350-fe22b8bd0e70839a001e0c91e9e598faa36e724b.tar.gz scummvm-rg350-fe22b8bd0e70839a001e0c91e9e598faa36e724b.tar.bz2 scummvm-rg350-fe22b8bd0e70839a001e0c91e9e598faa36e724b.zip | |
DIRECTOR: Fix scanned archive names
Diffstat (limited to 'engines/director/score.cpp')
| -rw-r--r-- | engines/director/score.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/director/score.cpp b/engines/director/score.cpp index 6d6d02274c..90506519ac 100644 --- a/engines/director/score.cpp +++ b/engines/director/score.cpp @@ -108,12 +108,14 @@ Score::Score(DirectorEngine *vm, Archive *archive) { _stopPlay = false; _stageColor = 0; - if (_movieArchive->hasResource(MKTAG('M','C','N','M'), 0)) { - _macName = _movieArchive->getName(MKTAG('M','C','N','M'), 0).c_str(); + if (archive->hasResource(MKTAG('M','C','N','M'), 0)) { + _macName = archive->getName(MKTAG('M','C','N','M'), 0).c_str(); + } else { + _macName = archive->getFileName(); } - if (_movieArchive->hasResource(MKTAG('V','W','L','B'), 1024)) { - loadLabels(*_movieArchive->getResource(MKTAG('V','W','L','B'), 1024)); + if (archive->hasResource(MKTAG('V','W','L','B'), 1024)) { + loadLabels(*archive->getResource(MKTAG('V','W','L','B'), 1024)); } } @@ -344,7 +346,7 @@ void Score::loadLabels(Common::SeekableSubReadStreamEndian &stream) { Common::SortedArray<Label *>::iterator j; for (j = _labels->begin(); j != _labels->end(); ++j) { - debug("Frame %d, Label %s", (*j)->number, (*j)->name.c_str()); + debugC(2, kDebugLoading, "Frame %d, Label %s", (*j)->number, (*j)->name.c_str()); } } |