diff options
author | Thanasis Antoniou | 2019-08-31 20:06:37 +0300 |
---|---|---|
committer | Thanasis Antoniou | 2019-08-31 20:06:37 +0300 |
commit | 85fbb3ad08c81eb2bd142ef2683f6de439025a22 (patch) | |
tree | de1590407f905235ba629bd71d0152156be8ad12 /engines/bladerunner/ui | |
parent | a99e8d7baba5bcbc6cc07ff2d34d81fb7e3e93dc (diff) | |
download | scummvm-rg350-85fbb3ad08c81eb2bd142ef2683f6de439025a22.tar.gz scummvm-rg350-85fbb3ad08c81eb2bd142ef2683f6de439025a22.tar.bz2 scummvm-rg350-85fbb3ad08c81eb2bd142ef2683f6de439025a22.zip |
BLADERUNNER: Addendum for removal of delayMillis
Diffstat (limited to 'engines/bladerunner/ui')
-rw-r--r-- | engines/bladerunner/ui/elevator.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/ui/end_credits.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/ui/esper.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/ui/spinner.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/ui/vk.cpp | 4 |
5 files changed, 11 insertions, 9 deletions
diff --git a/engines/bladerunner/ui/elevator.cpp b/engines/bladerunner/ui/elevator.cpp index 15354c739c..db3a465ee4 100644 --- a/engines/bladerunner/ui/elevator.cpp +++ b/engines/bladerunner/ui/elevator.cpp @@ -215,7 +215,9 @@ void Elevator::tick() { // unsigned difference is intentional if (timeNow - _timeLast < _vm->kUpdateFrameTimeInMs && !_firstTickCall) { return; - } else if (_firstTickCall) { + } + + if (_firstTickCall) { _firstTickCall = false; } diff --git a/engines/bladerunner/ui/end_credits.cpp b/engines/bladerunner/ui/end_credits.cpp index 91e8501794..9ff6e1dbce 100644 --- a/engines/bladerunner/ui/end_credits.cpp +++ b/engines/bladerunner/ui/end_credits.cpp @@ -112,7 +112,9 @@ void EndCredits::show() { uint32 timeNow = _vm->_time->currentSystem(); if (timeNow - timeLast < _vm->kUpdateFrameTimeInMs && !firstPass) { continue; - } else if (firstPass) { + } + + if (firstPass) { firstPass = false; } diff --git a/engines/bladerunner/ui/esper.cpp b/engines/bladerunner/ui/esper.cpp index a8877e9e1d..bb97ae308a 100644 --- a/engines/bladerunner/ui/esper.cpp +++ b/engines/bladerunner/ui/esper.cpp @@ -216,9 +216,7 @@ void ESPER::tick() { uint32 timeNow = _vm->_time->currentSystem(); // unsigned difference is intentional - if (timeNow - _timeLast < _vm->kUpdateFrameTimeInMs && !_firstTickCall) { - return; - } else { + if (timeNow - _timeLast >= _vm->kUpdateFrameTimeInMs || _firstTickCall) { if (_firstTickCall) { _firstTickCall = false; } diff --git a/engines/bladerunner/ui/spinner.cpp b/engines/bladerunner/ui/spinner.cpp index 1f3439ee9a..2b084c9a2c 100644 --- a/engines/bladerunner/ui/spinner.cpp +++ b/engines/bladerunner/ui/spinner.cpp @@ -259,7 +259,9 @@ void Spinner::tick() { // unsigned difference is intentional if (timeNow - _timeLast < _vm->kUpdateFrameTimeInMs && !_firstTickCall) { return; - } else if (_firstTickCall) { + } + + if (_firstTickCall) { _firstTickCall = false; } diff --git a/engines/bladerunner/ui/vk.cpp b/engines/bladerunner/ui/vk.cpp index e9064ab409..5fbf763166 100644 --- a/engines/bladerunner/ui/vk.cpp +++ b/engines/bladerunner/ui/vk.cpp @@ -195,9 +195,7 @@ void VK::tick() { uint32 timeNow = _vm->_time->currentSystem(); // unsigned difference is intentional - if (timeNow - _timeLast < _vm->kUpdateFrameTimeInMs && !_firstTickCall) { - return; - } else { + if (timeNow - _timeLast >= _vm->kUpdateFrameTimeInMs || _firstTickCall) { if (_firstTickCall) { _firstTickCall = false; } |