thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KYRA: (HOF) - fix bug #3721 (Sound and speech plays at the same time)

Browse source
This commit is contained in:
athrxx 2020-01-23 00:49:15 +01:00
parent 5467ca6330
commit 1d5fd780ce
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/kyra/engine/kyra_hof.cpp
View file

@ -1420,12 +1420,13 @@ void KyraEngine_HoF::snd_playVoiceFile(int id) {
sprintf(vocFile, "%07d", id); sprintf(vocFile, "%07d", id);
if (_sound->isVoicePresent(vocFile)) { if (_sound->isVoicePresent(vocFile)) {
// Unlike the original I have added a timeout here. I have chosen a size that makes sure that it // Unlike the original I have added a timeout here. I have chosen a size that makes sure that it
// won't get triggered in any of the bug #11309 situations, but still avoids infinite hangups if // won't get triggered in any of the bug #11309 or bug #3721 situations, but still avoids infinite
// something goes wrong. // hangups if something goes wrong.
uint32 end = _system->getMillis() + 2500; uint32 timeout = _system->getMillis() + 5000;
while (snd_voiceIsPlaying() && _system->getMillis() < end && !skipFlag()) while (_sound->voiceIsPlaying() && _system->getMillis() < timeout && !skipFlag())
delay(10); delay(10);
if (_system->getMillis() >= end && !skipFlag()) _chatEndTime += (_system->getMillis() + 5000 - timeout);
if (_system->getMillis() >= timeout && !skipFlag())
debugC(3, kDebugLevelSound, "KyraEngine_HoF::snd_playVoiceFile(): Speech finish wait timeout"); debugC(3, kDebugLevelSound, "KyraEngine_HoF::snd_playVoiceFile(): Speech finish wait timeout");
snd_stopVoice(); snd_stopVoice();