libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 09:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- fixed bug in Sound::voiceIsPlaying

Browse Source 
- fixed speech animation duration in Kyra1

svn-id: r31221
This commit is contained in:
Johannes Schickel 2008-03-22 14:29:30 +00:00
parent df78d4d484
commit 46376d38a9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/kyra/sound.cpp
View File

@ -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;

2
engines/kyra/text_v1.cpp
View File

@ -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;