[Scummvm-git-logs] scummvm master -> 18fd6f603d3a4efff7db704ceac37571dc083d25

[bgK]

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:
18fd6f603d MOHAWK: MYST: Fix incorrect door close sound for the cablin


Commit: 18fd6f603d3a4efff7db704ceac37571dc083d25
    https://github.com/scummvm/scummvm/commit/18fd6f603d3a4efff7db704ceac37571dc083d25
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-06-23T08:12:03+02:00

Commit Message:
MOHAWK: MYST: Fix incorrect door close sound for the cablin

Fixes Trac#10580.

Changed paths:
    engines/mohawk/myst_scripts.cpp


diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp
index a2a0c5e..aac0bd3 100644
--- a/engines/mohawk/myst_scripts.cpp
+++ b/engines/mohawk/myst_scripts.cpp
@@ -561,6 +561,15 @@ void MystScriptParser::o_toggleAreasActivation(uint16 var, const ArgumentsArray
 void MystScriptParser::o_playSound(uint16 var, const ArgumentsArray &args) {
 	uint16 soundId = args[0];
 
+	// WORKAROUND: In the Myst age, when in front of the cabin coming from the left
+	// with the door open, when trying to go left, a script tries to play a sound
+	// with id 4197. That sound does not exist in the game archives. However, when
+	// going right another script plays a door closing sound with id 4191.
+	// Here, we replace the incorrect sound id with a proper one.
+	if (soundId == 4197) {
+		soundId = 4191;
+	}
+
 	_vm->_sound->playEffect(soundId);
 }