[Scummvm-git-logs] scummvm master -> 85fbb3ad08c81eb2bd142ef2683f6de439025a22

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
85fbb3ad08 BLADERUNNER: Addendum for removal of delayMillis


Commit: 85fbb3ad08c81eb2bd142ef2683f6de439025a22
    https://github.com/scummvm/scummvm/commit/85fbb3ad08c81eb2bd142ef2683f6de439025a22
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-08-31T20:06:37+03:00

Commit Message:
BLADERUNNER: Addendum for removal of delayMillis

Changed paths:
    engines/bladerunner/outtake.cpp
    engines/bladerunner/ui/elevator.cpp
    engines/bladerunner/ui/end_credits.cpp
    engines/bladerunner/ui/esper.cpp
    engines/bladerunner/ui/spinner.cpp
    engines/bladerunner/ui/vk.cpp


diff --git a/engines/bladerunner/outtake.cpp b/engines/bladerunner/outtake.cpp
index 0c995ff..cb54816 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 15354c7..db3a465 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 91e8501..9ff6e1d 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 a8877e9..bb97ae3 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 1f3439e..2b084c9 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 e9064ab..5fbf763 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;
 		}