From 916221dc562c9062839918d58d1a9968eb8f2b5e Mon Sep 17 00:00:00 2001 From: Peter Kohaut Date: Mon, 11 Feb 2019 22:44:38 +0100 Subject: BLADERUNNER: Added original logic for speech skipping And some small cleanup of unnecessary comments. --- engines/bladerunner/ui/vk.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engines/bladerunner/ui') 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(); } -- cgit v1.2.3