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/talk.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/talk.cpp')
| -rw-r--r-- | queen/talk.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/queen/talk.cpp b/queen/talk.cpp index fe412eafde..75e8f9672d 100644 --- a/queen/talk.cpp +++ b/queen/talk.cpp @@ -757,7 +757,7 @@ void Talk::defaultAnimation( break; } - if (_vm->sound()->speechOn()) { + if (_vm->sound()->speechOn() && _vm->sound()->speechSfxExists()) { // sfx is finished, stop the speak animation if (!_vm->sound()->isSpeechActive()) { break; @@ -772,7 +772,7 @@ void Talk::defaultAnimation( } } - // Make sure that Person closes their mouths + // Make sure that Person closes their mouth if (!isJoe && parameters->ff > 0) _vm->bankMan()->overpack(parameters->ff, startFrame, bankNum); } @@ -834,7 +834,7 @@ void Talk::speakSegment( if (!isJoe) { if (SPEAK_AMAL_ON == command) { // It's the oracle! - // Dont turn AMAL animation off, and dont manually anim person + // Don't turn AMAL animation off, and don't manually anim person command = SPEAK_ORACLE; oracle = true; uint16 frameNum = _vm->graphics()->personFrames(bobNum); |