[Scummvm-git-logs] scummvm master -> 718d79c05be6248b3637a8fec361ab8f9d8c968d

[sluicebox]

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

Summary:
4713278be2 SCI32: Add detection for LSL7 Polish "data" directory
718d79c05b SCI32: Add support for LSL7 Polish InstallShield files


Commit: 4713278be2d55faf871a3c026bede5b16b0346e1
    https://github.com/scummvm/scummvm/commit/4713278be2d55faf871a3c026bede5b16b0346e1
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-05-16T21:11:08-06:00

Commit Message:
SCI32: Add detection for LSL7 Polish "data" directory

Fixes bug #10066

Changed paths:
    engines/sci/sci.cpp


diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 60dc61030f..e0cf4d1ad8 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -155,6 +155,7 @@ SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc, SciGameId gam
 	SearchMan.addSubDirectoryMatching(gameDataDir, "movies");	// VMD movie files
 	SearchMan.addSubDirectoryMatching(gameDataDir, "music");	// LSL7 music files (GOG version)
 	SearchMan.addSubDirectoryMatching(gameDataDir, "music/22s16");	// LSL7 music files
+	SearchMan.addSubDirectoryMatching(gameDataDir, "data");	// LSL7 Polish patch files (Trac #10066)
 	SearchMan.addSubDirectoryMatching(gameDataDir, "vmd");	// VMD movie files
 	SearchMan.addSubDirectoryMatching(gameDataDir, "duk");	// Duck movie files in Phantasmagoria 2
 	SearchMan.addSubDirectoryMatching(gameDataDir, "Robot Folder"); // Mac robot files


Commit: 718d79c05be6248b3637a8fec361ab8f9d8c968d
    https://github.com/scummvm/scummvm/commit/718d79c05be6248b3637a8fec361ab8f9d8c968d
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-05-16T21:13:33-06:00

Commit Message:
SCI32: Add support for LSL7 Polish InstallShield files

Fixes bug #10066

Changed paths:
    engines/sci/resource/resource.cpp


diff --git a/engines/sci/resource/resource.cpp b/engines/sci/resource/resource.cpp
index 32947a3309..d9f8a9728d 100644
--- a/engines/sci/resource/resource.cpp
+++ b/engines/sci/resource/resource.cpp
@@ -28,6 +28,7 @@
 #include "common/textconsole.h"
 #include "common/translation.h"
 #ifdef ENABLE_SCI32
+#include "common/installshield_cab.h"
 #include "common/memstream.h"
 #endif
 
@@ -732,6 +733,18 @@ int ResourceManager::addAppropriateSources() {
 	if (Common::File::exists("altres.map"))
 		addSource(new VolumeResourceSource("altres.000", addExternalMap("altres.map"), 0));
 
+#ifdef ENABLE_SCI32
+	// Some LSL7 Polish CDs have all of the patch files in InstallShield cabinet files
+	//  (data1.cab/hdr) while the rest of the game is in normal SCI files. Trac #10066
+	if (g_sci &&
+		g_sci->getGameId() == GID_LSL7 && g_sci->getLanguage() == Common::PL_POL) {
+		Common::Archive *archive = Common::makeInstallShieldArchive("data");
+		if (archive != nullptr) {
+			SearchMan.add("data1.cab", archive);
+		}
+	}
+#endif
+
 	return 1;
 }