diff options
| author | Eugene Sandulenko | 2019-11-24 18:26:41 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-11-24 18:42:45 +0100 |
| commit | 663b8d61fb9867ede25752f9436d51ff03be52f8 (patch) | |
| tree | af8b454890b6eae58b4d6ad0be8b4d5e8bdfe99e | |
| parent | 8efad569686c206fbca0be9974c71dbeee035a83 (diff) | |
| download | scummvm-rg350-663b8d61fb9867ede25752f9436d51ff03be52f8.tar.gz scummvm-rg350-663b8d61fb9867ede25752f9436d51ff03be52f8.tar.bz2 scummvm-rg350-663b8d61fb9867ede25752f9436d51ff03be52f8.zip | |
DIRECTOR: Properly load A11 script and STXT resources
| -rw-r--r-- | engines/director/score.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/engines/director/score.cpp b/engines/director/score.cpp index cd91589dec..82b09e8fdb 100644 --- a/engines/director/score.cpp +++ b/engines/director/score.cpp @@ -204,24 +204,22 @@ void Score::loadArchive() { } } + // Now process STXTs + Common::Array<uint16> stxt = _movieArchive->getResourceIDList(MKTAG('S','T','X','T')); + // Try to load movie script, it sits in resource A11 if (_vm->getVersion() <= 3) { - Common::Array<uint16> stxt = _movieArchive->getResourceIDList(MKTAG('S','T','X','T')); if (stxt.size() > 0) { - debugC(2, kDebugLoading, "****** Loading %d STXT resources", stxt.size()); - - for (Common::Array<uint16>::iterator iterator = stxt.begin(); iterator != stxt.end(); ++iterator) { - loadScriptText(*_movieArchive->getResource(MKTAG('S','T','X','T'), *iterator)); - // Load STXTS - - _loadedStxts->setVal(*iterator, - new Stxt(*_movieArchive->getResource(MKTAG('S','T','X','T'), - *iterator)) - ); - } + loadScriptText(*_movieArchive->getResource(MKTAG('S','T','X','T'), *stxt.begin())); } - copyCastStxts(); } + + debugC(2, kDebugLoading, "****** Loading %d STXT resources", stxt.size()); + for (Common::Array<uint16>::iterator iterator = stxt.begin(); iterator != stxt.end(); ++iterator) { + _loadedStxts->setVal(*iterator, + new Stxt(*_movieArchive->getResource(MKTAG('S','T','X','T'), *iterator))); + } + copyCastStxts(); } void Score::copyCastStxts() { |