diff options
author | Johannes Schickel | 2005-11-27 10:02:23 +0000 |
---|---|---|
committer | Johannes Schickel | 2005-11-27 10:02:23 +0000 |
commit | ee69f9317d14915816943b3d803a09def2605872 (patch) | |
tree | b901dd5099f499e871c3b5450c33e4358988af26 /kyra/script_v1.cpp | |
parent | ceb9116ab29b8c3d0a5f7825b7a46bf13793910c (diff) | |
download | scummvm-rg350-ee69f9317d14915816943b3d803a09def2605872.tar.gz scummvm-rg350-ee69f9317d14915816943b3d803a09def2605872.tar.bz2 scummvm-rg350-ee69f9317d14915816943b3d803a09def2605872.zip |
Added voices for cd version in the game.
Also increased RESFILE_VERSION for the new kyra.dat for the cd version.
svn-id: r19717
Diffstat (limited to 'kyra/script_v1.cpp')
-rw-r--r-- | kyra/script_v1.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp index 5b26cc5e1e..7d82bc3687 100644 --- a/kyra/script_v1.cpp +++ b/kyra/script_v1.cpp @@ -314,6 +314,12 @@ 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()) { + _sprites->updateSceneAnims(); + updateAllObjectShapes(); + _system->delayMillis(10); + } + snd_playVoiceFile(stackPos(0)); characterSays(stackPosString(1), stackPos(2), stackPos(3)); } else { debug(3, "cmd_characterSays(0x%X) ('%s', %d, %d)", script, stackPosString(0), stackPos(1), stackPos(2)); @@ -773,6 +779,12 @@ int KyraEngine::cmd_loadPageFromDisk(ScriptState *script) { int KyraEngine::cmd_customPrintTalkString(ScriptState *script) { if (_features & GF_TALKIE) { debug(3, "cmd_customPrintTalkString(0x%X) ('%s', %d, %d, %d)", script, stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF); + while (snd_voicePlaying()) { + _sprites->updateSceneAnims(); + updateAllObjectShapes(); + _system->delayMillis(10); + } + snd_playVoiceFile(stackPos(0)); printTalkTextMessage(stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF, 0, 2); } else { debug(3, "cmd_customPrintTalkString(0x%X) ('%s', %d, %d, %d)", script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF); @@ -1428,10 +1440,10 @@ int KyraEngine::cmd_setScaleDepthTableValue(ScriptState *script) { int KyraEngine::cmd_message(ScriptState *script) { if (_features & GF_TALKIE) { - debug(9, "cmd_message(0x%X)", script); + debug(3, "cmd_message(0x%X) (%d, '%s', %d)", script, stackPos(0), stackPosString(1), stackPos(2)); drawSentenceCommand(stackPosString(1), stackPos(2)); } else { - debug(9, "cmd_message(0x%X)", script); + debug(3, "cmd_message(0x%X) ('%s', %d)", script, stackPosString(0), stackPos(1)); drawSentenceCommand(stackPosString(0), stackPos(1)); } |