[Scummvm-git-logs] scummvm master -> b208c8249441f21c22ebf23256c2e8e81a34034c

[csnover]

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:
6da5a175cb SCI32: Add detection for KQ7 German 1.65c
b208c82494 SCI32: Add support for Shivers interactive demo


Commit: 6da5a175cb5e1808e8a3f22dadee31cfd410271e
    https://github.com/scummvm/scummvm/commit/6da5a175cb5e1808e8a3f22dadee31cfd410271e
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-05-01T12:30:57-05:00

Commit Message:
SCI32: Add detection for KQ7 German 1.65c

Closes Trac#9738.

Changed paths:
    engines/sci/detection_tables.h


diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 0d10802..975377b 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -1871,6 +1871,15 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformWindows, ADGF_TESTING | ADGF_CD, GUIO_KQ7 },
 
+	// King's Quest 7 - German Windows (from blumentopferde in bug report Trac#9738)
+	// VERSION 1.65c
+	{"kq7", "", {
+		{"resource.aud", 0, "3d0ee18dab2d1ad1f171d1bbc0f8d080", 242391379},
+		{"resource.000", 0, "4948e4e1506f1e1c4e1d47abfa06b7f8", 204385195},
+		{"resource.map", 0, "59d234e4fd61c1377f659c8479a513fb", 18925},
+		AD_LISTEND},
+		Common::DE_DEU, Common::kPlatformWindows, ADGF_TESTING | ADGF_CD, GUIO_KQ7 },
+
 	// King's Quest 7 - English DOS (from FRG)
 	// SCI interpreter version 2.100.002, VERSION file reports "2.00b"
 	{"kq7", "", {


Commit: b208c8249441f21c22ebf23256c2e8e81a34034c
    https://github.com/scummvm/scummvm/commit/b208c8249441f21c22ebf23256c2e8e81a34034c
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-05-01T12:31:21-05:00

Commit Message:
SCI32: Add support for Shivers interactive demo

Closes Trac#9745.

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


diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 975377b..6ea7079 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -3992,14 +3992,21 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::DE_DEU, Common::kPlatformWindows, ADGF_TESTING, GUIO_SHIVERS },
 
-	// Shivers - English Windows Demo
+	// Shivers - English Windows Non-interactive Demo
 	// Executable scanning reports "2.100.002"
-	{"shivers", "Demo", {
+	{"shivers", "Non-interactive Demo", {
 		{"resmap.000", 0, "d9e0bc5eddefcbe47f528760085d8927", 1186},
 		{"ressci.000", 0, "3a93c6340b54e07e65d0e5583354d186", 10505469},
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_TESTING, GUIO_SHIVERS },
 
+	// Shivers - English Windows Interactive Demo (from bgK in bug report Trac#9745)
+	{"shivers", "Demo", {
+		{"resmap.000", 0, "58a20b0c839d31d56802ead6c8f953c4", 7069},
+		{"ressci.000", 0, "f9eb6338f658945feadd4d27e58bdb93", 37404155},
+		AD_LISTEND},
+		Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO | ADGF_TESTING, GUIO_SHIVERS },
+
 #undef GUIO_SHIVERS_DEMO
 #undef GUIO_SHIVERS
 
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index f61a8db..94347ec 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1372,6 +1372,16 @@ void ResourceManager::processPatch(ResourceSource *source, ResourceType resource
 	ResourceId resId = ResourceId(resourceType, resourceNr, tuple);
 	ResourceType checkForType = resourceType;
 
+	// HACK: The SFX resource map patch in the Shivers interactive demo has
+	// broken offsets for some sounds; ignore it so that the correct map from
+	// RESSCI.000 will be used instead
+	if (g_sci->getGameId() == GID_SHIVERS && g_sci->isDemo() &&
+		resourceType == kResourceTypeMap && resourceNr == 65535) {
+
+		delete source;
+		return;
+	}
+
 	// base36 encoded patches (i.e. audio36 and sync36) have the same type as their non-base36 encoded counterparts
 	if (checkForType == kResourceTypeAudio36)
 		checkForType = kResourceTypeAudio;