[Scummvm-git-logs] scummvm master -> 961d222cee3140651e4fdc872708cf5dd3680e37

[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:
961d222cee SCI32: Ignore invalid LSL7 French audio map


Commit: 961d222cee3140651e4fdc872708cf5dd3680e37
    https://github.com/scummvm/scummvm/commit/961d222cee3140651e4fdc872708cf5dd3680e37
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-01-27T17:30:39-08:00

Commit Message:
SCI32: Ignore invalid LSL7 French audio map

Fixes bug #11315

Changed paths:
    engines/sci/resource_audio.cpp


diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 76997e7..41c213f 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -533,6 +533,14 @@ int ResourceManager::readAudioMapSCI11(IntMapResourceSource *map) {
 				}
 			}
 
+			// LSL7 French has an invalid audio36 map entry for a narrator
+			//  message that was cut from the game. This resource existed
+			//  in the English version even though it was inaccessible.
+			if (g_sci->getGameId() == GID_LSL7 &&
+				map->_mapNumber == 999) {
+				continue;
+			}
+
 			// Map 800 and 4176 contain content that was cut from the game. The
 			// French version of the game includes map files from the US
 			// release, but the audio resources are French so the maps don't