DIRECTOR: Add multiple resources in exe using ProjectorArchive

This patch uses ProjectorArchive to extract multiple resources embedded into executable files, additionally a new function getRawExe is defined which gets raw exe file name without --start-movie overriding it.
Solves the problem for finding multiple resource files like `ModTB.DXR` in 'mcluhan', uses 'mcluhan.exe' to extract resources and add them to SearchMan.

Author: hari01584

engines/director/archive.h

@@ -149,6 +149,36 @@ class RIFXArchive : public Archive {
 	Common::HashMap<uint32, KeyMap> _keyData;
 };
 
+/*******************************************
+ *
+ * Projector Archive
+ *
+ *******************************************/
+
+class ProjectorArchive : public Common::Archive {
+public:
+	ProjectorArchive(Common::String path);
+	~ProjectorArchive() override;
+
+	bool hasFile(const Common::Path &path) const override;
+	int listMembers(Common::ArchiveMemberList &list) const override;
+	const Common::ArchiveMemberPtr getMember(const Common::Path &path) const override;
+	Common::SeekableReadStream *createReadStreamForMember(const Common::Path &path) const override;
+	bool isLoaded() { return _isLoaded; }
+private:
+	Common::SeekableReadStream *createBufferedReadStream();
+	bool loadArchive(Common::SeekableReadStream *stream);
+
+	struct Entry {
+		uint32 offset;
+		uint32 size;
+	};
+	typedef Common::HashMap<Common::String, Entry, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> FileMap;
+	FileMap _files;
+	Common::String _path;
+
+	bool _isLoaded;
+};
 } // End of namespace Director
 
 #endif

engines/director/director.cpp

@@ -290,12 +290,17 @@ Common::CodePage DirectorEngine::getPlatformEncoding() {
 	return getEncoding(getPlatform(), getLanguage());
 }
 
+Common::String DirectorEngine::getRawEXEName() const {
+	// Returns raw executable name (without getting overloaded from --start-movie option)
+	return Common::punycode_decodefilename(Common::lastPathComponent(_gameDescription->desc.filesDescriptions[0].fileName, '/'));
+}
+
 Common::String DirectorEngine::getEXEName() const {
 	StartMovie startMovie = getStartMovie();
 	if (startMovie.startMovie.size() > 0)
 		return startMovie.startMovie;
 
-	return Common::punycode_decodefilename(Common::lastPathComponent(_gameDescription->desc.filesDescriptions[0].fileName, '/'));
+	return getRawEXEName();
 }
 
 void DirectorEngine::parseOptions() {

engines/director/director.h

@@ -159,6 +159,7 @@ class DirectorEngine : public ::Engine {
 	Common::Language getLanguage() const;
 	Common::String getTargetName() { return _targetName; }
 	const char *getExtra();
+	Common::String getRawEXEName() const;
 	Common::String getEXEName() const;
 	StartMovie getStartMovie() const;
 	void parseOptions();

engines/director/resource.cpp

@@ -63,6 +63,15 @@ Common::Error Window::loadInitialMovie() {
 		return Common::kNoGameDataFoundError;
 	}
 
+	// Load multiple-resources based executable file (Projector)
+	ProjectorArchive *multiArchive = new ProjectorArchive(_vm->getRawEXEName());
+	if (multiArchive->isLoaded()) {
+		// A valid projector archive, add to SearchMan
+		SearchMan.add(_vm->getRawEXEName(), multiArchive);
+	} else {
+		delete multiArchive;
+	}
+	
 	_currentMovie = new Movie(this);
 	_currentPath = getPath(movie, _currentPath);
 	Common::String sharedCastPath = getSharedCastPath();
@@ -531,43 +540,14 @@ void Window::loadStartMovieXLibs() {
 	g_lingo->openXLib("SerialPort", kXObj);
 }
 
-/*******************************************
- *
- * Projector Archive
- *
- *******************************************/
-
-class ProjectorArchive : public Common::Archive {
-public:
-	ProjectorArchive(Common::String path);
-	~ProjectorArchive() override;
-
-	bool hasFile(const Common::Path &path) const override;
-	int listMembers(Common::ArchiveMemberList &list) const override;
-	const Common::ArchiveMemberPtr getMember(const Common::Path &path) const override;
-	Common::SeekableReadStream *createReadStreamForMember(const Common::Path &path) const override;
-
-private:
-	Common::SeekableReadStream *createBufferedReadStream();
-	bool loadArchive(Common::SeekableReadStream *stream);
-
-	struct Entry {
-		uint32 offset;
-		uint32 size;
-	};
-	typedef Common::HashMap<Common::String, Entry, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> FileMap;
-	FileMap _files;
-	Common::String _path;
-};
-
 ProjectorArchive::ProjectorArchive(Common::String path)
 	: _path(path), _files() {
 
 	// Buffer 100K into memory
 	Common::SeekableReadStream *stream = createBufferedReadStream();
 
 	// Build our filemap using the buffered stream
-	loadArchive(stream);
+	_isLoaded = loadArchive(stream);
 
 	delete stream;
 }