diff options
| author | Johannes Schickel | 2006-01-13 23:06:04 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-01-13 23:06:04 +0000 |
| commit | d2de796c31f2c6057d4842f8131c154b10fae4f7 (patch) | |
| tree | 362a79cc34c02c50d3af55363b3196cb78cf14b7 /kyra/script_v1.cpp | |
| parent | d04475121e29e567dd24085ee1541d92c4e865b3 (diff) | |
| download | scummvm-rg350-d2de796c31f2c6057d4842f8131c154b10fae4f7.tar.gz scummvm-rg350-d2de796c31f2c6057d4842f8131c154b10fae4f7.tar.bz2 scummvm-rg350-d2de796c31f2c6057d4842f8131c154b10fae4f7.zip | |
Reorganized the sound code a bit and fixed bug # 1404414 (Missing speech patterns).
svn-id: r20006
Diffstat (limited to 'kyra/script_v1.cpp')
| -rw-r--r-- | kyra/script_v1.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp index 3d7956f894..696a146282 100644 --- a/kyra/script_v1.cpp +++ b/kyra/script_v1.cpp @@ -50,9 +50,7 @@ int KyraEngine::cmd_characterSays(ScriptState *script) { if (_features & GF_TALKIE) { debug(3, "cmd_characterSays(0x%X) (%d, '%s', %d, %d)", script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3)); - while (snd_voicePlaying() && !_fastMode) { - delay(10); - } + snd_voiceWaitForFinish(); snd_playVoiceFile(stackPos(0)); characterSays(stackPosString(1), stackPos(2), stackPos(3)); } else { @@ -614,9 +612,7 @@ int KyraEngine::cmd_loadPageFromDisk(ScriptState *script) { int KyraEngine::cmd_customPrintTalkString(ScriptState *script) { if (_features & GF_TALKIE) { debug(3, "cmd_customPrintTalkString(0x%X) (%d, '%s', %d, %d, %d)", script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF); - while (snd_voicePlaying() && !_fastMode) { - delay(10); - } + snd_voiceWaitForFinish(); snd_playVoiceFile(stackPos(0)); _text->printTalkTextMessage(stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF, 0, 2); } else { |