[Scummvm-git-logs] scummvm master -> 5cdeb8d66ddb5114b414f77f0acc8b641e305f68

[alxpnv]

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

Summary:
0f812498a1 ASYLUM: avoid C++11 features
eb1e2f9c56 ASYLUM: add workaround for combined resource packs
5cdeb8d66d ASYLUM: don't detect the Steam version as the GOG version


Commit: 0f812498a1fb031b3639fd3ca6adcc63f0c31f36
    https://github.com/scummvm/scummvm/commit/0f812498a1fb031b3639fd3ca6adcc63f0c31f36
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-08-02T14:00:35+03:00

Commit Message:
ASYLUM: avoid C++11 features

Changed paths:
    engines/asylum/shared.h


diff --git a/engines/asylum/shared.h b/engines/asylum/shared.h
index 70c42c85f3..69afd04e37 100644
--- a/engines/asylum/shared.h
+++ b/engines/asylum/shared.h
@@ -28,7 +28,7 @@ namespace Asylum {
 //////////////////////////////////////////////////////////////////////////
 // Global
 //////////////////////////////////////////////////////////////////////////
-enum GameFlag : uint32 {
+enum GameFlag {
 	kGameFlag0                    = 0,
 
 	kGameFlag4                    = 4,


Commit: eb1e2f9c56d21ec2bcfc337c3cad5100898f07a4
    https://github.com/scummvm/scummvm/commit/eb1e2f9c56d21ec2bcfc337c3cad5100898f07a4
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-08-02T14:00:35+03:00

Commit Message:
ASYLUM: add workaround for combined resource packs

Changed paths:
    engines/asylum/respack.cpp


diff --git a/engines/asylum/respack.cpp b/engines/asylum/respack.cpp
index a09c596bf1..023ca9ad62 100644
--- a/engines/asylum/respack.cpp
+++ b/engines/asylum/respack.cpp
@@ -24,6 +24,26 @@
 
 namespace Asylum {
 
+const struct {
+	int  cdNumber;
+	uint resourceId;
+	uint size;
+} patchedSizes[] = {
+	{3, 0x800403EB, 18177962},
+	{2, 0x8004071D, 40501676},
+	{2, 0x80040733, 40367314},
+	{2, 0x8004073C, 40347616},
+	{3, 0x8004074A, 17247084},
+	{3, 0x80040756, 15741212},
+	{2, 0x8004075E, 39099030},
+	{3, 0x80040782, 15468752},
+	{2, 0x80040783, 36119940},
+	{3, 0x8004093A,  6679208},
+	{3, 0x80040942,  4502532},
+	{3, 0x80040970,   654212},
+	{2, 0x8004097D,   524576},
+};
+
 //////////////////////////////////////////////////////////////////////////
 // ResourceManager
 //////////////////////////////////////////////////////////////////////////
@@ -63,6 +83,12 @@ ResourceEntry *ResourceManager::get(ResourceId id) {
 					error("[ResourceManager::get] Cd number has not been set!");
 
 				pack = new ResourcePack(Common::String::format("res.%01d%02d", _cdNumber, packId));
+
+				// WORKAROUND to support combined resource packs (used by GOG and Steam versions)
+				if (pack->_packFile.size() == 299872422)
+					for (int i = 0; i < ARRAYSIZE(patchedSizes); i++)
+						if (_cdNumber == patchedSizes[i].cdNumber)
+							pack->_resources[RESOURCE_INDEX(patchedSizes[i].resourceId)].size = patchedSizes[i].size;
 			} else {
 				pack = new ResourcePack(Common::String::format("res.%03d", packId));
 			}


Commit: 5cdeb8d66ddb5114b414f77f0acc8b641e305f68
    https://github.com/scummvm/scummvm/commit/5cdeb8d66ddb5114b414f77f0acc8b641e305f68
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-08-02T14:00:35+03:00

Commit Message:
ASYLUM: don't detect the Steam version as the GOG version

Requested in #12661

Changed paths:
    engines/asylum/detection.cpp
    engines/asylum/detection_tables.h


diff --git a/engines/asylum/detection.cpp b/engines/asylum/detection.cpp
index 5bf2603430..f35ec3b55b 100644
--- a/engines/asylum/detection.cpp
+++ b/engines/asylum/detection.cpp
@@ -48,7 +48,7 @@ class AsylumMetaEngineDetection : public AdvancedMetaEngineDetection {
 public:
 	AsylumMetaEngineDetection() : AdvancedMetaEngineDetection(Asylum::gameDescriptions, sizeof(ADGameDescription), asylumGames) {
 		_md5Bytes = 0;
-		_maxScanDepth = 2;
+		_maxScanDepth = 3;
 		_directoryGlobs = Asylum::directoryGlobs;
 	}
 
diff --git a/engines/asylum/detection_tables.h b/engines/asylum/detection_tables.h
index 1a13ac1260..d5e0b02af7 100644
--- a/engines/asylum/detection_tables.h
+++ b/engines/asylum/detection_tables.h
@@ -29,6 +29,7 @@ namespace Asylum {
 
 static const char *directoryGlobs[] = {
 	"Data",
+	"Vids",
 	0
 };
 
@@ -79,6 +80,7 @@ static const ADGameDescription gameDescriptions[] = {
 			{"SNTRM.DAT", 0, "7cfcc457c1f579fbf9878ac175d29374", 8930},
 			{"RES.000",   0, "f58f8dc3e63663f174977d359e11132c", 272057},
 			{"SCN.006",   0, "3a5b54da08198012dc0614114782d5fb", 2918330},
+			{"MOV000.SMK", 0, NULL, -1},
 			AD_LISTEND
 		},
 		Common::EN_ANY,