From 31ffd4d2e80e83b70fc9311583e892d44980ede3 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 24 Oct 2016 19:04:55 +0200
Subject: DIRECTOR: Load shared cast only when it exists

---
 engines/director/director.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines')

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);
-- 
cgit v1.2.3