[Scummvm-git-logs] scummvm master -> 772df1fb3bba2f7830b693f1b488fa96d91c5ba7

[sluicebox]

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

Summary:
772df1fb3b SCI: Ignore Windows GM sound in DOS MOTHERGOOSE256


Commit: 772df1fb3bba2f7830b693f1b488fa96d91c5ba7
    https://github.com/scummvm/scummvm/commit/772df1fb3bba2f7830b693f1b488fa96d91c5ba7
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-05-06T18:24:14-07:00

Commit Message:
SCI: Ignore Windows GM sound in DOS MOTHERGOOSE256

Fixes music in multilingual DOS MOTHERGOOSE256 CD, bug #11243

Changed paths:
    engines/sci/resource.cpp


diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 0ac0c31614..7c4cc18fc1 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1532,6 +1532,15 @@ bool ResourceManager::isBlacklistedPatch(const ResourceId &resId) const {
 		// eliminate user error when copying files from the original CDs, since
 		// each CD had a different 65535.MAP patch file.
 		return resId.getType() == kResourceTypeMap && resId.getNumber() == 65535;
+	case GID_MOTHERGOOSE256:
+		// The multilingual CD of Mothergoose 256 has a patch file SOUND.001
+		//  which only contains a General MIDI track of the main music for
+		//  Windows. Ignore this patch file for DOS so that the resource in
+		//  RESOURCE.001 with all the normal tracks gets used. Bug #11243
+		return g_sci->isCD() &&
+			g_sci->getPlatform() == Common::kPlatformDOS &&
+			resId.getType() == kResourceTypeSound &&
+			resId.getNumber() == 1;
 	default:
 		return false;
 	}