diff options
| author | Eugene Sandulenko | 2016-10-24 19:04:55 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-10-24 19:06:07 +0200 |
| commit | 31ffd4d2e80e83b70fc9311583e892d44980ede3 (patch) | |
| tree | 8c08334a550dec35a38b7767553319f846896247 /engines/director | |
| parent | 012cf1b561f803f02f9bfe973447a34f7e01757c (diff) | |
| download | scummvm-rg350-31ffd4d2e80e83b70fc9311583e892d44980ede3.tar.gz scummvm-rg350-31ffd4d2e80e83b70fc9311583e892d44980ede3.tar.bz2 scummvm-rg350-31ffd4d2e80e83b70fc9311583e892d44980ede3.zip | |
DIRECTOR: Load shared cast only when it exists
Diffstat (limited to 'engines/director')
| -rw-r--r-- | engines/director/director.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/director/director.cpp b/engines/director/director.cpp index 5d646956d0..8c5e456781 100644 --- a/engines/director/director.cpp +++ b/engines/director/director.cpp @@ -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); |