From 85fbb3ad08c81eb2bd142ef2683f6de439025a22 Mon Sep 17 00:00:00 2001
From: Thanasis Antoniou
Date: Sat, 31 Aug 2019 20:06:37 +0300
Subject: BLADERUNNER: Addendum for removal of delayMillis

---
 engines/bladerunner/outtake.cpp        | 4 +++-
 engines/bladerunner/ui/elevator.cpp    | 4 +++-
 engines/bladerunner/ui/end_credits.cpp | 4 +++-
 engines/bladerunner/ui/esper.cpp       | 4 +---
 engines/bladerunner/ui/spinner.cpp     | 4 +++-
 engines/bladerunner/ui/vk.cpp          | 4 +---
 6 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/bladerunner/outtake.cpp b/engines/bladerunner/outtake.cpp
index 0c995ff614..cb54816c38 100644
--- a/engines/bladerunner/outtake.cpp
+++ b/engines/bladerunner/outtake.cpp
@@ -86,7 +86,9 @@ void OuttakePlayer::play(const Common::String &name, bool noLocalization, int co
 		// unsigned difference is intentional
 		if (timeNow - _timeLast < _vm->kUpdateFrameTimeInMs && !firstFrame) {
 			continue;
-		} else if (firstFrame) {
+		}
+
+		if (firstFrame) {
 			firstFrame = false;
 		}
 
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;
 		}
-- 
cgit v1.2.3