[Scummvm-cvs-logs] scummvm master -> d811df89ff4c786ec36b44f598e6f373519e5e2b

[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:
d811df89ff MORTEVIELLE: Fix door animation display when opening the doors


Commit: d811df89ff4c786ec36b44f598e6f373519e5e2b
    https://github.com/scummvm/scummvm/commit/d811df89ff4c786ec36b44f598e6f373519e5e2b
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-12T15:06:09-07:00

Commit Message:
MORTEVIELLE: Fix door animation display when opening the doors

Changed paths:
    engines/mortevielle/actions.cpp



diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 3e3db5b..f7cc239 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -1147,6 +1147,10 @@ void MortevielleEngine::fctEnter() {
 				int randVal = (getRandomNumber(0, 10)) - 5;
 				_soundManager.startSpeech(7, randVal, 1);
 				displayAnimFrame(1, 1);
+				while (_mixer->isSoundHandleActive(_soundManager._soundHandle) && !keyPressed() && !_mouseClick && !shouldQuit())
+					;
+				// In case the handle is still active, stop it.
+				_mixer->stopHandle(_soundManager._soundHandle);
 
 				int charIndex = convertBitIndexToCharacterIndex(z);
 				++_coreVar._faithScore;
@@ -1168,6 +1172,10 @@ void MortevielleEngine::fctEnter() {
 			int randVal = (getRandomNumber(0, 10)) - 5;
 			_soundManager.startSpeech(7, randVal, 1);
 			displayAnimFrame(1, 1);
+			while (_mixer->isSoundHandleActive(_soundManager._soundHandle) && !keyPressed() && !_mouseClick && !shouldQuit())
+				;
+			// In case the handle is still active, stop it.
+			_mixer->stopHandle(_soundManager._soundHandle);
 
 			_coreVar._currPlace = _roomDoorId;
 			prepareDisplayText();