[Scummvm-git-logs] scummvm master -> a992dcc91a5574bad055c38ee89f4c284bae5c27

bgK bastien.bouclet at gmail.com
Sun Apr 22 08:19:23 CEST 2018


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0ebf04520a MOHAWK: MYST: Fix the sound effect not playing in opcode 41
a992dcc91a MOHAWK: LB: Mark some switch fall-throughs as intentional


Commit: 0ebf04520a7e5d2eff59fda6d90cd8b39b43b301
    https://github.com/scummvm/scummvm/commit/0ebf04520a7e5d2eff59fda6d90cd8b39b43b301
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-04-22T08:15:14+02:00

Commit Message:
MOHAWK: MYST: Fix the sound effect not playing in opcode 41

Changing the background sound when switching cards could stop the effect
sound immediately after it started.

Fixes Trac#10493.

Changed paths:
    engines/mohawk/myst_scripts.cpp


diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp
index 4b22a94..1ff08ea 100644
--- a/engines/mohawk/myst_scripts.cpp
+++ b/engines/mohawk/myst_scripts.cpp
@@ -754,11 +754,11 @@ void MystScriptParser::o_changeCardPlaySoundDirectional(uint16 var, const Argume
 	debugC(kDebugScript, "\tdelay between steps: %d", delayBetweenSteps);
 	debugC(kDebugScript, "\tanimated update data size: %d", dataSize);
 
+	_vm->changeToCard(cardId, kNoTransition);
+
 	if (soundId)
 		_vm->_sound->playEffect(soundId);
 
-	_vm->changeToCard(cardId, kNoTransition);
-
 	animatedUpdate(ArgumentsArray(args.begin() + 4, dataSize), delayBetweenSteps);
 }
 


Commit: a992dcc91a5574bad055c38ee89f4c284bae5c27
    https://github.com/scummvm/scummvm/commit/a992dcc91a5574bad055c38ee89f4c284bae5c27
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-04-22T08:17:50+02:00

Commit Message:
MOHAWK: LB: Mark some switch fall-throughs as intentional

Fall-throughs are used as a way to handle optional parameters in this
function.

Changed paths:
    engines/mohawk/livingbooks_code.cpp


diff --git a/engines/mohawk/livingbooks_code.cpp b/engines/mohawk/livingbooks_code.cpp
index b5ea547..7eb5a0c 100644
--- a/engines/mohawk/livingbooks_code.cpp
+++ b/engines/mohawk/livingbooks_code.cpp
@@ -1349,14 +1349,17 @@ void LBCode::cmdSetPlayParams(const Common::Array<LBValue> &params) {
 	switch (params.size()) {
 	case 8:
 		target->_soundMode = params[7].integer;
+		// fall through
 	case 7:
 		target->_controlMode = params[6].integer;
+		// fall through
 	case 6:
 		// TODO: _relocPoint?
 	case 5:
 		// TODO: _periodMin/Max
 	case 4:
 		target->_timingMode = params[3].integer;
+		// fall through
 	case 3:
 		// TODO: _delayMin/Max
 	case 2:





More information about the Scummvm-git-logs mailing list