diff options
author | Peter Kohaut | 2018-02-12 20:53:13 +0100 |
---|---|---|
committer | Peter Kohaut | 2018-02-12 20:57:26 +0100 |
commit | 1d9a248abe37a5e8230571d2b35cd96773be7f1e (patch) | |
tree | 08fb84f18dc8b3d5dbcc12555e7804b0cfb34e0b /engines/bladerunner/bladerunner.cpp | |
parent | 7f50c5040144627cf00ccd91831946c356c45860 (diff) | |
download | scummvm-rg350-1d9a248abe37a5e8230571d2b35cd96773be7f1e.tar.gz scummvm-rg350-1d9a248abe37a5e8230571d2b35cd96773be7f1e.tar.bz2 scummvm-rg350-1d9a248abe37a5e8230571d2b35cd96773be7f1e.zip |
BLADERUNNER: Fixed more Coverity issues
Diffstat (limited to 'engines/bladerunner/bladerunner.cpp')
-rw-r--r-- | engines/bladerunner/bladerunner.cpp | 32 |
1 files changed, 18 insertions, 14 deletions
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(); |