BLADERUNNER: Fixed end credits

Game is completable for blade runner path

6 files changed, 17 insertions, 17 deletions

diff --git a/engines/bladerunner/ui/elevator.cpp b/engines/bladerunner/ui/elevator.cpp
index 759c0e7cb6..a5e0c65fdd 100644
--- a/engines/bladerunner/ui/elevator.cpp
+++ b/engines/bladerunner/ui/elevator.cpp
@@ -204,7 +204,7 @@ int Elevator::handleMouseDown(int x, int y) {
 }
 
 void Elevator::tick() {
-	if (!_vm->_gameIsRunning) {
+	if (!_vm->_windowIsActive) {
 		return;
 	}
 
@@ -283,8 +283,6 @@ void Elevator::buttonFocus(int buttonId) {
 void Elevator::setupDescription(int actorId, int sentenceId) {
 	_actorId = actorId;
 	_sentenceId = sentenceId;
-
-	// TODO: Use proper timer
 	_timeSpeakDescription = _vm->_time->current() + 600;
 }
 
diff --git a/engines/bladerunner/ui/end_credits.cpp b/engines/bladerunner/ui/end_credits.cpp
index 096f8988bb..0fc97d09be 100644
--- a/engines/bladerunner/ui/end_credits.cpp
+++ b/engines/bladerunner/ui/end_credits.cpp
@@ -105,7 +105,7 @@ void EndCredits::show() {
 		//soundSystem::tick(SoundSystem);
 		_vm->handleEvents();
 
-		if (!_vm->_gameIsRunning) {
+		if (!_vm->_windowIsActive) {
 			timeLast = _vm->getTotalPlayTime(); // Original game is using system timer
 
 			continue;
diff --git a/engines/bladerunner/ui/esper.cpp b/engines/bladerunner/ui/esper.cpp
index 791dd273ab..51e956cbb2 100644
--- a/engines/bladerunner/ui/esper.cpp
+++ b/engines/bladerunner/ui/esper.cpp
@@ -208,7 +208,7 @@ void ESPER::handleMouseDown(int x, int y, bool mainButton) {
 }
 
 void ESPER::tick() {
-	if (!_vm->_gameIsRunning) {
+	if (!_vm->_windowIsActive) {
 		return;
 	}
 
diff --git a/engines/bladerunner/ui/scores.cpp b/engines/bladerunner/ui/scores.cpp
index 3879d81c4e..3134299a1d 100644
--- a/engines/bladerunner/ui/scores.cpp
+++ b/engines/bladerunner/ui/scores.cpp
@@ -95,7 +95,7 @@ void Scores::close() {
 
 	_vm->closeArchive("MODE.MIX");
 
-	// TODO: Unfreeze game time
+	_vm->_time->resume();
 	_vm->_scene->resume();
 }
 
@@ -129,7 +129,7 @@ int Scores::handleMouseDown(int x, int y) {
 }
 
 void Scores::tick() {
-	if (!_vm->_gameIsRunning) {
+	if (!_vm->_windowIsActive) {
 		return;
 	}
 
diff --git a/engines/bladerunner/ui/spinner.cpp b/engines/bladerunner/ui/spinner.cpp
index 32809e8740..eb3b1977f8 100644
--- a/engines/bladerunner/ui/spinner.cpp
+++ b/engines/bladerunner/ui/spinner.cpp
@@ -29,8 +29,9 @@
 #include "bladerunner/scene.h"
 #include "bladerunner/shape.h"
 #include "bladerunner/text_resource.h"
-#include "bladerunner/vqa_player.h"
+#include "bladerunner/time.h"
 #include "bladerunner/ui/ui_image_picker.h"
+#include "bladerunner/vqa_player.h"
 
 #include "common/rect.h"
 #include "common/system.h"
@@ -155,7 +156,8 @@ int Spinner::chooseDestination(int loopId, bool immediately) {
 		this
 	);
 
-	// TODO: Freeze game time
+	_vm->_time->pause();
+
 	_selectedDestination = -1;
 	do {
 		_vm->gameTick();
@@ -176,7 +178,7 @@ int Spinner::chooseDestination(int loopId, bool immediately) {
 
 	_isOpen = false;
 
-	// TODO: Unfreeze game time
+	_vm->_time->resume();
 	_vm->_scene->resume();
 
 	return _selectedDestination;
@@ -207,7 +209,7 @@ int Spinner::handleMouseDown(int x, int y) {
 }
 
 void Spinner::tick() {
-	if (!_vm->_gameIsRunning) {
+	if (!_vm->_windowIsActive) {
 		return;
 	}
 
diff --git a/engines/bladerunner/ui/vk.cpp b/engines/bladerunner/ui/vk.cpp
index 031ba3b093..ab2b5de221 100644
--- a/engines/bladerunner/ui/vk.cpp
+++ b/engines/bladerunner/ui/vk.cpp
@@ -34,14 +34,14 @@
 #include "bladerunner/mouse.h"
 #include "bladerunner/music.h"
 #include "bladerunner/scene.h"
-#include "bladerunner/shape.h"
 #include "bladerunner/script/vk_script.h"
+#include "bladerunner/shape.h"
 #include "bladerunner/slice_renderer.h"
+#include "bladerunner/subtitles.h"
 #include "bladerunner/text_resource.h"
 #include "bladerunner/time.h"
 #include "bladerunner/ui/ui_image_picker.h"
 #include "bladerunner/vqa_player.h"
-#include "bladerunner/subtitles.h"
 
 #include "common/str.h"
 #include "common/keyboard.h"
@@ -128,7 +128,7 @@ void VK::open(int actorId, int calibrationRatio) {
 
 	_script = new VKScript(_vm);
 
-	//TODO: time->lock()
+	_vm->_time->pause();
 
 	init();
 }
@@ -184,7 +184,7 @@ void VK::close() {
 	_vm->_music->setVolume(_volumeMusic);
 	_vm->_ambientSounds->setVolume(_volumeAmbient);
 
-	// TODO: time->unlock();
+	_vm->_time->resume();
 	_vm->_scene->resume();
 }
 
@@ -472,7 +472,7 @@ void VK::init() {
 }
 
 void VK::draw() {
-	if (!_isOpen || !_vm->_gameIsRunning) {
+	if (!_isOpen || !_vm->_windowIsActive) {
 		return;
 	}
 
@@ -895,7 +895,7 @@ void VK::askQuestion(int intensity) {
 
 	for (int i = 0; i < (int)_questions[intensity].size(); ++i) {
 		if (_questions[intensity][i].isPresent && !_questions[intensity][i].wasAsked) {
-			// TODO: related questions are not used in game
+			// cut content? related questions are not used in game
 			// int relatedQuestion = -1;
 			// if (_questions[intensity][i].relatedSentenceId >= 0) {
 			// 	relatedQuestion = vk::findQuestionById(this, questions, relatedQuestionId);