diff options
| author | Thanasis Antoniou | 2019-09-10 18:47:05 +0300 |
|---|---|---|
| committer | Thanasis Antoniou | 2019-09-10 19:18:45 +0300 |
| commit | bef3f902e693a4f17fef896d8a991077d1a602a6 (patch) | |
| tree | 76e346c845c8ce23ff6f978793a3408d43030356 | |
| parent | e8f009e04f875b3ed75356068749a4f1b4d1fd55 (diff) | |
| download | scummvm-rg350-bef3f902e693a4f17fef896d8a991077d1a602a6.tar.gz scummvm-rg350-bef3f902e693a4f17fef896d8a991077d1a602a6.tar.bz2 scummvm-rg350-bef3f902e693a4f17fef896d8a991077d1a602a6.zip | |
BLADERUNNER: Add DebugMan.clearAllDebugChannels() in shutdown
| -rw-r--r-- | engines/bladerunner/bladerunner.cpp | 4 | ||||
| -rw-r--r-- | engines/bladerunner/script/ai/dektora.cpp | 2 | ||||
| -rw-r--r-- | engines/bladerunner/script/ai/mutant3.cpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp index 2cea8161c5..a2fa003ae6 100644 --- a/engines/bladerunner/bladerunner.cpp +++ b/engines/bladerunner/bladerunner.cpp @@ -715,6 +715,8 @@ void BladeRunnerEngine::initChapterAndScene() { } void BladeRunnerEngine::shutdown() { + DebugMan.clearAllDebugChannels(); + _mixer->stopAll(); // BLADE.INI as updated here @@ -2186,7 +2188,7 @@ void BladeRunnerEngine::newGame(int difficulty) { for (uint i = 0; i < _gameInfo->getActorCount(); ++i) { _actors[i]->setup(i); } - _actors[kActorVoiceOver]->setup(99); + _actors[kActorVoiceOver]->setup(kActorVoiceOver); for (uint i = 0; i < _gameInfo->getSuspectCount(); ++i) { _suspectsDatabase->get(i)->reset(); diff --git a/engines/bladerunner/script/ai/dektora.cpp b/engines/bladerunner/script/ai/dektora.cpp index 70b081f60e..63fe72a1bb 100644 --- a/engines/bladerunner/script/ai/dektora.cpp +++ b/engines/bladerunner/script/ai/dektora.cpp @@ -320,7 +320,7 @@ bool AIScriptDektora::ShotAtAndHit() { void AIScriptDektora::Retired(int byActorId) { if (byActorId == kActorMcCoy) { - Actor_Modify_Friendliness_To_Other(kActorClovis, 0, -5); + Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, -5); } if (byActorId == kActorSteele diff --git a/engines/bladerunner/script/ai/mutant3.cpp b/engines/bladerunner/script/ai/mutant3.cpp index fbc41d743f..06f97cde3e 100644 --- a/engines/bladerunner/script/ai/mutant3.cpp +++ b/engines/bladerunner/script/ai/mutant3.cpp @@ -151,14 +151,14 @@ void AIScriptMutant3::OtherAgentEnteredCombatMode(int otherActorId, int combatMo void AIScriptMutant3::ShotAtAndMissed() { if (Actor_Query_Goal_Number(kActorMutant3) != 410) { Actor_Modify_Combat_Aggressiveness(kActorMutant3, 15); - Actor_Modify_Friendliness_To_Other(kActorMutant3, 0, -15); + Actor_Modify_Friendliness_To_Other(kActorMutant3, kActorMcCoy, -15); } } bool AIScriptMutant3::ShotAtAndHit() { if (Actor_Query_Goal_Number(kActorMutant3) != 410) { Actor_Modify_Combat_Aggressiveness(kActorMutant3, 20); - Actor_Modify_Friendliness_To_Other(kActorMutant3, 0, -20); + Actor_Modify_Friendliness_To_Other(kActorMutant3, kActorMcCoy, -20); } return false; } |