diff options
| author | Strangerke | 2013-08-11 12:40:53 +0200 |
|---|---|---|
| committer | Strangerke | 2013-08-11 12:40:53 +0200 |
| commit | 17245005c340982d7cfe70c26980ce790a70ebc5 (patch) | |
| tree | df71d4203d25d6289274c8e92829a5175e6d2e6a | |
| parent | e48515d4020d22814e5ddb1a6caa64c28f4a43ed (diff) | |
| download | scummvm-rg350-17245005c340982d7cfe70c26980ce790a70ebc5.tar.gz scummvm-rg350-17245005c340982d7cfe70c26980ce790a70ebc5.tar.bz2 scummvm-rg350-17245005c340982d7cfe70c26980ce790a70ebc5.zip | |
MORTEVIELLE: Fix sound checks (thanks to fuzzie for pointing them out)
| -rw-r--r-- | engines/mortevielle/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/mortevielle/utils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp index 1007ccc4aa..a39bdf5120 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 db1861c146..81bdb6e387 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))); |