diff options
| author | Gregory Montoir | 2004-12-19 12:19:21 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-12-19 12:19:21 +0000 |
| commit | ec2099a9020e341d9cc23cb2a9cb8c14e8bc8703 (patch) | |
| tree | c5b0bf253aab5ea57ed5c70ddd80a5e236bba4e3 /queen/cutaway.cpp | |
| parent | 739828391e1d6944ff97473e585de4c0550372d2 (diff) | |
| download | scummvm-rg350-ec2099a9020e341d9cc23cb2a9cb8c14e8bc8703.tar.gz scummvm-rg350-ec2099a9020e341d9cc23cb2a9cb8c14e8bc8703.tar.bz2 scummvm-rg350-ec2099a9020e341d9cc23cb2a9cb8c14e8bc8703.zip | |
Fixed regression in queen floppy version. Before doing any speech/texts synchronization, we check the voice sfx exists. See also patch #1087870
svn-id: r16131
Diffstat (limited to 'queen/cutaway.cpp')
| -rw-r--r-- | queen/cutaway.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index e27c3d63b7..bb704b096e 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -960,7 +960,7 @@ void Cutaway::run(char *nextFilename) { // if the cutaway has been cancelled, we must stop the speech and the sfx as well if (_vm->input()->cutawayQuit()) { - if (_vm->sound()->speechOn()) + if (_vm->sound()->isSpeechActive()) _vm->sound()->stopSpeech(); _vm->sound()->stopSfx(); } @@ -1262,7 +1262,7 @@ void Cutaway::handleText( break; } - if ((OBJECT_TYPE_TEXT_SPEAK == type || OBJECT_TYPE_TEXT_DISPLAY_AND_SPEAK == type) && _vm->sound()->speechOn()) { + if ((OBJECT_TYPE_TEXT_SPEAK == type || OBJECT_TYPE_TEXT_DISPLAY_AND_SPEAK == type) && _vm->sound()->speechOn() && _vm->sound()->speechSfxExists()) { if (!_vm->sound()->isSpeechActive()) { break; } |