From 7be4a743054db6bbde68fafb577130c3f4aa5289 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Tue, 12 Jan 2016 19:34:28 +0100 Subject: MOHAWK: Fix incorrect condition in Myst's sound block opcode --- engines/mohawk/myst_scripts.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp index 41e066064e..487d0f45fe 100644 --- a/engines/mohawk/myst_scripts.cpp +++ b/engines/mohawk/myst_scripts.cpp @@ -721,9 +721,7 @@ void MystScriptParser::o_changeBackgroundSound(uint16 op, uint16 var, uint16 arg for (uint16 i = 0; i < condCount; i++) { soundList[i] = argv[decodeIdx++]; debugC(kDebugScript, "\t\tCondition %d: Action %d", i, soundList[i]); - // CHECKME: At this point, soundAction is always kMystSoundActionConditional (-4) - // The soundListVolume is therefore always set to 65535 - if (soundAction == kMystSoundActionChangeVolume || soundAction > 0) { + if (soundList[i] == kMystSoundActionChangeVolume || soundList[i] > 0) { soundListVolume[i] = argv[decodeIdx++]; } else soundListVolume[i] = 65535; -- cgit v1.2.3