[Scummvm-cvs-logs] scummvm master -> 17245005c340982d7cfe70c26980ce790a70ebc5

Strangerke Strangerke at scummvm.org
Sun Aug 11 12:42:03 CEST 2013


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:
17245005c3 MORTEVIELLE: Fix sound checks (thanks to fuzzie for pointing them out)


Commit: 17245005c340982d7cfe70c26980ce790a70ebc5
    https://github.com/scummvm/scummvm/commit/17245005c340982d7cfe70c26980ce790a70ebc5
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-11T03:40:53-07:00

Commit Message:
MORTEVIELLE: Fix sound checks (thanks to fuzzie for pointing them out)

Changed paths:
    engines/mortevielle/sound.cpp
    engines/mortevielle/utils.cpp



diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp
index 1007ccc..a39bdf5 100644
--- a/engines/mortevielle/sound.cpp
+++ b/engines/mortevielle/sound.cpp
@@ -135,7 +135,7 @@ void SoundManager::litph(tablint &t, int typ, int tempo) {
 		return;
 
 	if (!_vm->_speechManager._buildingSentence) {
-		if (!_mixer->isSoundHandleActive(_soundHandle))
+		if (_mixer->isSoundHandleActive(_soundHandle))
 			_mixer->stopHandle(_soundHandle);
 		_vm->_speechManager._buildingSentence = true;
 	}
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index db1861c..81bdb6e 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -276,7 +276,7 @@ void MortevielleEngine::handleAction() {
 			if (shouldQuit())
 				return;
 			++temps;
-			if (!_soundManager._mixer->isSoundHandleActive(_soundManager._soundHandle) || keyPressed() || _mouseClick) {
+			if (keyPressed() || _mouseClick) {
 				_soundManager._mixer->stopHandle(_soundManager._soundHandle);
 			}
 		} while (!((_menu._menuSelected) || (temps > lim) || (funct) || (_anyone)));






More information about the Scummvm-git-logs mailing list