diff options
| author | Johannes Schickel | 2008-05-24 22:47:08 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-05-24 22:47:08 +0000 |
| commit | 335eb1bf0853dbdede70fc4366fd1ff166715198 (patch) | |
| tree | 40077f06fc91cef4b7937a1af17edfca1f981a87 /engines/kyra/text_lok.cpp | |
| parent | 6866a4e133f2ae505bc142bc4b35e79d48f5191a (diff) | |
| download | scummvm-rg350-335eb1bf0853dbdede70fc4366fd1ff166715198.tar.gz scummvm-rg350-335eb1bf0853dbdede70fc4366fd1ff166715198.tar.bz2 scummvm-rg350-335eb1bf0853dbdede70fc4366fd1ff166715198.zip | |
Committed my fix for bug #1497437 "KYRA1: Subtitles glitch during 'Speech of the Land'".
svn-id: r32260
Diffstat (limited to 'engines/kyra/text_lok.cpp')
| -rw-r--r-- | engines/kyra/text_lok.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/text_lok.cpp b/engines/kyra/text_lok.cpp index ccca079e32..f6b0407a75 100644 --- a/engines/kyra/text_lok.cpp +++ b/engines/kyra/text_lok.cpp @@ -62,10 +62,8 @@ void KyraEngine_LoK::waitForChatToFinish(int vocFile, int16 chatDuration, const if (chatDuration != -1) chatDuration *= _tickLength; - if (vocFile != -1) { - snd_voiceWaitForFinish(); + if (vocFile != -1) snd_playVoiceFile(vocFile); - } _timer->disable(14); _timer->disable(18); @@ -269,6 +267,8 @@ void KyraEngine_LoK::characterSays(int vocFile, const char *chatStr, int8 charNu if (_currentCharacter->sceneId == 210) return; + snd_voiceWaitForFinish(true); + convoInitialized = initCharacterChat(charNum); chatPartnerNum = getChatPartnerNum(); |