diff options
| author | Johannes Schickel | 2008-05-24 23:05:01 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-05-24 23:05:01 +0000 |
| commit | 64910f8c5fb3a9e39e356fc2856d311d8ad77bd6 (patch) | |
| tree | a5995aa6f6533d0a299b68c5731bd3359b30b06e /engines/kyra/script_lok.cpp | |
| parent | af7bc93c461bd5b7dbd4eeed01b87ad8dbc4e1a1 (diff) | |
| download | scummvm-rg350-64910f8c5fb3a9e39e356fc2856d311d8ad77bd6.tar.gz scummvm-rg350-64910f8c5fb3a9e39e356fc2856d311d8ad77bd6.tar.bz2 scummvm-rg350-64910f8c5fb3a9e39e356fc2856d311d8ad77bd6.zip | |
Little cleanup.
svn-id: r32262
Diffstat (limited to 'engines/kyra/script_lok.cpp')
| -rw-r--r-- | engines/kyra/script_lok.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp index d4825387d9..efa0f8e48f 100644 --- a/engines/kyra/script_lok.cpp +++ b/engines/kyra/script_lok.cpp @@ -727,8 +727,8 @@ int KyraEngine_LoK::o1_displayWSASequentialFrames(EMCState *script) { if (_flags.isTalkie) { int specialTime = stackPos(7); if (specialTime) { - int32 voiceTime = _speechPlayTime; - if (voiceTime && voiceTime != -1) { + uint32 voiceTime = snd_getVoicePlayTime(); + if (voiceTime) { int displayFrames = ABS(endFrame-startFrame)+1; displayFrames *= maxTime; assert(displayFrames != 0); @@ -745,13 +745,10 @@ int KyraEngine_LoK::o1_displayWSASequentialFrames(EMCState *script) { if (voiceSync) { uint32 voicePlayedTime = _sound->voicePlayedTime(_speechFile.c_str()); - if (voicePlayedTime >= (uint32)voiceTime) + if (voicePlayedTime >= voiceTime) voiceTime = 0; else voiceTime -= voicePlayedTime; - - if (!snd_voiceIsPlaying()) - voiceTime = 0; } waitTime = voiceTime / displayFrames; |