[Scummvm-cvs-logs] scummvm master -> 75d1385c8d1ba61b5740a0b43966d3c2f111440d

[Strangerke]

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:
75d1385c8d LAB: Wait for the end of sound effects when they are played in Diff files. Fixes toilet noises.


Commit: 75d1385c8d1ba61b5740a0b43966d3c2f111440d
    https://github.com/scummvm/scummvm/commit/75d1385c8d1ba61b5740a0b43966d3c2f111440d
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-01-25T01:11:51+01:00

Commit Message:
LAB: Wait for the end of sound effects when they are played in Diff files. Fixes toilet noises.

Changed paths:
    engines/lab/processroom.cpp



diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index f0d17bb..ecbfb4e 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -252,9 +252,16 @@ void LabEngine::doActions(const ActionList &actionList) {
 			_music->loadSoundEffect(action->_messages[0], true, false);
 			break;
 
-		case kActionShowDiff:
+		case kActionShowDiff: {
+			bool curWait = _anim->_waitForEffect;
+			// Pause the engine until the sound is finished
+			_anim->_waitForEffect = true;
 			_graphics->readPict(action->_messages[0], true);
+
+			// Restore the previous value of _waitForEffect
+			_anim->_waitForEffect = curWait;
 			break;
+			}
 
 		case kActionShowDiffLooping:	// used in scene 44 (heart of the labyrinth, minotaur)
 			_graphics->readPict(action->_messages[0], false);