diff options
| author | Johannes Schickel | 2008-03-22 14:29:30 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-03-22 14:29:30 +0000 |
| commit | 46376d38a9fb780549461b809125c7e8b68df546 (patch) | |
| tree | 581e81c4a029bc546c04795b090461885f1a8885 | |
| parent | df78d4d4843ecd3ab815a028f42b26751bbb5cdf (diff) | |
| download | scummvm-rg350-46376d38a9fb780549461b809125c7e8b68df546.tar.gz scummvm-rg350-46376d38a9fb780549461b809125c7e8b68df546.tar.bz2 scummvm-rg350-46376d38a9fb780549461b809125c7e8b68df546.zip | |
- fixed bug in Sound::voiceIsPlaying
- fixed speech animation duration in Kyra1
svn-id: r31221
| -rw-r--r-- | engines/kyra/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/text_v1.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 7dee4908fe..7e447e33c6 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -135,7 +135,7 @@ bool Sound::voiceIsPlaying(const char *file) { } else { for (int i = 0; i < kNumChannelHandles; ++i) { if (_soundChannels[i].file == file) - res = true; + res = _mixer->isSoundHandleActive(_soundChannels[i].channelHandle); } } return res; diff --git a/engines/kyra/text_v1.cpp b/engines/kyra/text_v1.cpp index b493a56d4a..5534992c6a 100644 --- a/engines/kyra/text_v1.cpp +++ b/engines/kyra/text_v1.cpp @@ -110,7 +110,7 @@ void KyraEngine_v1::waitForChatToFinish(int vocFile, int16 chatDuration, const c _animator->copyChangedObjectsForward(0); updateTextFade(); - if ((chatDuration < (int16)(_system->getMillis() - timeAtStart)) && chatDuration != -1 && (!drawText || !snd_voiceIsPlaying())) + if (((chatDuration < (int16)(_system->getMillis() - timeAtStart)) && chatDuration != -1 && drawText) || (!drawText && !snd_voiceIsPlaying())) break; uint32 nextTime = loopStart + _tickLength; |