DIRECTOR: Skipping useless movie scanning.

We can easily rely on the FS path resolving.

2 files changed, 11 insertions, 4 deletions

diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index 1af63a81b7..9976c253f7 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -194,7 +194,11 @@ void DirectorEngine::loadSharedCastsFrom(Common::String filename) {
 
 	debugC(1, kDebugLoading, "Loading Shared cast '%s'", filename.c_str());
 
-	shardcst->openFile(filename);
+	if (!shardcst->openFile(filename)) {
+		warning("No shared cast %s", filename.c_str());
+
+		return;
+	}
 
 	_sharedDIB = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>;
 	_sharedSTXT = new Common::HashMap<int, Common::SeekableSubReadStreamEndian *>;
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 8c5e456781..034c7c4afb 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -120,10 +120,13 @@ Common::Error DirectorEngine::run() {
 
 	//testFont();
 
-	_movies = scanMovies(ConfMan.get("path"));
+	if (getPlatform() == Common::kPlatformWindows)
+		_sharedCastFile = "SHARDCST.MMM";
+	else
+		_sharedCastFile = "Shared Cast*";
+
+	loadSharedCastsFrom(_sharedCastFile);
 
-	if (!_sharedCastFile.empty())
-		loadSharedCastsFrom(_sharedCastFile);
 	loadMainArchive();
 
 	_currentScore = new Score(this, _mainArchive);