diff options
author | Peter Kohaut | 2019-02-11 22:44:38 +0100 |
---|---|---|
committer | Peter Kohaut | 2019-02-11 22:49:18 +0100 |
commit | 916221dc562c9062839918d58d1a9968eb8f2b5e (patch) | |
tree | 9c4e29ef5c2b4004d8a08922ab4e4b67e6a700f1 /engines/bladerunner/ui | |
parent | 6854ea3ddd83798a9045307763bbb346d8a1736b (diff) | |
download | scummvm-rg350-916221dc562c9062839918d58d1a9968eb8f2b5e.tar.gz scummvm-rg350-916221dc562c9062839918d58d1a9968eb8f2b5e.tar.bz2 scummvm-rg350-916221dc562c9062839918d58d1a9968eb8f2b5e.zip |
BLADERUNNER: Added original logic for speech skipping
And some small cleanup of unnecessary comments.
Diffstat (limited to 'engines/bladerunner/ui')
-rw-r--r-- | engines/bladerunner/ui/vk.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/bladerunner/ui/vk.cpp b/engines/bladerunner/ui/vk.cpp index ab2b5de221..6186452ad2 100644 --- a/engines/bladerunner/ui/vk.cpp +++ b/engines/bladerunner/ui/vk.cpp @@ -243,24 +243,24 @@ void VK::playSpeechLine(int actorId, int sentenceId, float duration) { actor->speechPlay(sentenceId, true); while (_vm->_gameIsRunning) { - // ActorSpeaking = 1; - _vm->_speechSkipped = false; + _vm->_actorIsSpeaking = true; + _vm->_actorSpeakStopIsRequested = false; _vm->gameTick(); - // ActorSpeaking = 0; - if (_vm->_speechSkipped || !actor->isSpeeching()) { + _vm->_actorIsSpeaking = false; + if (_vm->_actorSpeakStopIsRequested || !actor->isSpeeching()) { actor->speechStop(); break; } } - if (duration > 0.0f && !_vm->_speechSkipped) { + if (duration > 0.0f && !_vm->_actorSpeakStopIsRequested) { int timeEnd = duration * 1000.0f + _vm->_time->current(); while ((timeEnd > _vm->_time->current()) && _vm->_gameIsRunning) { _vm->gameTick(); } } - _vm->_speechSkipped = false; + _vm->_actorSpeakStopIsRequested = false; _vm->_mouse->enable(); } |