libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-15 16:58:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: Load shared cast only when it exists

Browse Source
This commit is contained in:
Eugene Sandulenko 2016-10-24 19:04:55 +02:00
parent 012cf1b561
commit 31ffd4d2e8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/director/director.cpp
View File

@ -122,7 +122,8 @@ Common::Error DirectorEngine::run() {
_movies = scanMovies(ConfMan.get("path"));
loadSharedCastsFrom(_sharedCastFile);
if (!_sharedCastFile.empty())
loadSharedCastsFrom(_sharedCastFile);
loadMainArchive();
_currentScore = new Score(this, _mainArchive);
@ -160,6 +161,7 @@ Common::HashMap<Common::String, Score *> *DirectorEngine::scanMovies(const Commo
Archive *arc = createArchive();
warning("name: %s", i->getName().c_str());
arc->openFile(i->getName());
Score *sc = new Score(this, arc);
nameMap->setVal(sc->getMacName(), sc);