From 1d9a248abe37a5e8230571d2b35cd96773be7f1e Mon Sep 17 00:00:00 2001
From: Peter Kohaut
Date: Mon, 12 Feb 2018 20:53:13 +0100
Subject: BLADERUNNER: Fixed more Coverity issues

---
 engines/bladerunner/bladerunner.cpp | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'engines/bladerunner/bladerunner.cpp')

diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index df657065f7..8435e751fa 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -85,21 +85,24 @@ BladeRunnerEngine::BladeRunnerEngine(OSystem *syst, const ADGameDescription *des
 	  _rnd("bladerunner") {
 
 	_windowIsActive = true;
-	_gameIsRunning = true;
+	_gameIsRunning  = true;
+
 	_playerLosesControlCounter = 0;
 
 	_playerActorIdle = false;
-	_playerDead = false;
-	_speechSkipped = false;
-	_gameOver = false;
-	_gameAutoSave = 0;
-	_gameIsLoading = false;
-	_sceneIsLoading = false;
-
-	_walkingActorId = -1;
-
-	_walkSoundId = -1;
-	_walkSoundVolume = 0;
+	_playerDead      = false;
+	_speechSkipped   = false;
+	_gameOver        = false;
+	_gameAutoSave    = 0;
+	_gameIsLoading   = false;
+	_sceneIsLoading  = false;
+
+	_walkingActorId         = -1;
+	_isWalkingInterruptible = false;
+	_interruptWalking       = false;
+
+	_walkSoundId      = -1;
+	_walkSoundVolume  = 0;
 	_walkSoundBalance = 0;
 
 	_crimesDatabase = nullptr;
@@ -164,6 +167,8 @@ BladeRunnerEngine::BladeRunnerEngine(OSystem *syst, const ADGameDescription *des
 	_spinner                 = nullptr;
 	_elevator                = nullptr;
 	_mainFont                = nullptr;
+	_esper                   = nullptr;
+	_vk                      = nullptr;
 	_mouse                   = nullptr;
 	_sliceAnimations         = nullptr;
 	_sliceRenderer           = nullptr;
@@ -456,7 +461,6 @@ void BladeRunnerEngine::initChapterAndScene() {
 
 	_settings->setChapter(1);
 	_settings->setNewSetAndScene(_gameInfo->getInitialSetId(), _gameInfo->getInitialSceneId());
-//	_settings->setNewSetAndScene(52, 52);
 }
 
 void BladeRunnerEngine::shutdown() {
@@ -804,7 +808,7 @@ void BladeRunnerEngine::gameTick() {
 		}
 
 		if (_settings->getNewScene() == -1 || _sceneScript->isInsideScript() || _aiScripts->isInsideScript()) {
-			_sliceRenderer->setView(*_view);
+			_sliceRenderer->setView(_view);
 
 			// Tick and draw all actors in current set
 			int setId = _scene->getSetId();
-- 
cgit v1.2.3