[Scummvm-cvs-logs] scummvm master -> 7be4a743054db6bbde68fafb577130c3f4aa5289

[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:
7be4a74305 MOHAWK: Fix incorrect condition in Myst's sound block opcode


Commit: 7be4a743054db6bbde68fafb577130c3f4aa5289
    https://github.com/scummvm/scummvm/commit/7be4a743054db6bbde68fafb577130c3f4aa5289
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-01-12T19:34:28+01:00

Commit Message:
MOHAWK: Fix incorrect condition in Myst's sound block opcode

Changed paths:
    engines/mohawk/myst_scripts.cpp



diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp
index 41e0660..487d0f4 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;