[Scummvm-git-logs] scummvm master -> 2c1661bff2c91efb7299fdd3ba1b01b1f28f3b3a

[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:
2c1661bff2 SCI32: Fix QFG4CD Look Grate missing audio


Commit: 2c1661bff2c91efb7299fdd3ba1b01b1f28f3b3a
    https://github.com/scummvm/scummvm/commit/2c1661bff2c91efb7299fdd3ba1b01b1f28f3b3a
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2018-12-23T00:02:14-08:00

Commit Message:
SCI32: Fix QFG4CD Look Grate missing audio

Fixes a broken message due to wrong audio tuple, bug #10848

Changed paths:
    engines/sci/resource_audio.cpp


diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 2f713e4..6162808 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -461,6 +461,13 @@ int ResourceManager::readAudioMapSCI11(IntMapResourceSource *map) {
 				n = 0x02200001;
 			}
 
+			// QFG4CD has a message whose audio36 resource has the wrong tuple and never plays.
+			//  The message tuple is 510 23 1 0 1 but the audio36 tuple is 510 199 1 0 1. bug #10848
+			if (g_sci->getGameId() == GID_QFG4 && g_sci->isCD() &&
+				map->_mapNumber == 510 && n == 0xc7010001) {
+				n = 0x17010001;
+			}
+
 			if (isEarly) {
 				offset = ptr.getUint32LE();
 				ptr += 4;