Merge pull request #79 from clone2727/agos_cab

AGOS: Add support for loading data from Windows (InstallShield) installer archives

1 files changed, 31 insertions, 0 deletions

diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index 2be888b92a..a14b660817 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -240,6 +240,22 @@ Common::Platform AGOSEngine::getPlatform() const {
 }
 
 const char *AGOSEngine::getFileName(int type) const {
+	// Required if the InstallShield cab is been used
+	if (getGameType() == GType_PP) {
+		if (type == GAME_BASEFILE)
+			return gss->base_filename;
+	}
+
+	// Required if the InstallShield cab is been used
+	if (getGameType() == GType_FF && getPlatform() == Common::kPlatformWindows) {
+		if (type == GAME_BASEFILE)
+			return gss->base_filename;
+		if (type == GAME_RESTFILE)
+			return gss->restore_filename;
+		if (type == GAME_TBLFILE)
+			return gss->tbl_filename;
+	}
+
 	for (int i = 0; _gameDescription->desc.filesDescriptions[i].fileType; i++) {
 		if (_gameDescription->desc.filesDescriptions[i].fileType == type)
 			return _gameDescription->desc.filesDescriptions[i].fileName;
@@ -247,4 +263,19 @@ const char *AGOSEngine::getFileName(int type) const {
 	return NULL;
 }
 
+#ifdef ENABLE_AGOS2
+void AGOSEngine::loadArchives() {
+	const ADGameFileDescription *ag;
+
+	if (getFeatures() & GF_PACKED) {
+		for (ag = _gameDescription->desc.filesDescriptions; ag->fileName; ag++) {
+			if (!_archives.hasArchive(ag->fileName))
+				_archives.registerArchive(ag->fileName, ag->fileType);
+		}
+	}
+
+	_archives.enableFallback(true);
+}
+#endif
+
 } // End of namespace AGOS