[Scummvm-git-logs] scummvm master -> 31ffd4d2e80e83b70fc9311583e892d44980ede3

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
31ffd4d2e8 DIRECTOR: Load shared cast only when it exists


Commit: 31ffd4d2e80e83b70fc9311583e892d44980ede3
    https://github.com/scummvm/scummvm/commit/31ffd4d2e80e83b70fc9311583e892d44980ede3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-24T19:06:07+02:00

Commit Message:
DIRECTOR: Load shared cast only when it exists

Changed paths:
    engines/director/director.cpp



diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 5d64695..8c5e456 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);