diff options
| author | Thanasis Antoniou | 2019-05-22 00:43:48 +0300 |
|---|---|---|
| committer | Thanasis Antoniou | 2019-05-22 00:44:31 +0300 |
| commit | d2b8f9284caa2e8e1e632b8382875c3f2b90c257 (patch) | |
| tree | fbeff205e56d0208f2e171b82ef1f333a529b747 | |
| parent | 0def58f80273a54b276409b10c760576961fa366 (diff) | |
| download | scummvm-rg350-d2b8f9284caa2e8e1e632b8382875c3f2b90c257.tar.gz scummvm-rg350-d2b8f9284caa2e8e1e632b8382875c3f2b90c257.tar.bz2 scummvm-rg350-d2b8f9284caa2e8e1e632b8382875c3f2b90c257.zip | |
BLADERUNNER: Remove redundant call to playerGainsControl
When Steele retires Izo in RC03
| -rw-r--r-- | engines/bladerunner/script/ai/steele.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp index 33c1b8ee8b..d6fdf22d4b 100644 --- a/engines/bladerunner/script/ai/steele.cpp +++ b/engines/bladerunner/script/ai/steele.cpp @@ -745,6 +745,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) { case kGoalSteeleShootIzo: Actor_Force_Stop_Walking(kActorMcCoy); Sound_Play(kSfxSMCAL3, 100, 0, 0, 50); + // Scene_Exits_Enable() is done in Izo's kGoalIzoDie - CompletedMovementTrack() case Actor_Set_Goal_Number(kActorIzo, kGoalIzoDie); Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeIdle); Actor_Face_Actor(kActorMcCoy, kActorSteele, true); @@ -765,7 +766,9 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) { Actor_Face_Actor(kActorSteele, kActorMcCoy, true); Actor_Says(kActorSteele, 1930, kAnimationModeTalk); Actor_Set_Goal_Number(kActorSteele, kGoalSteeleLeaveRC03); - Player_Gains_Control(); +#if BLADERUNNER_ORIGINAL_BUGS + Player_Gains_Control(); // redundant - causes "WARNING: Unbalanced call to BladeRunnerEngine::playerGainsControl" +#endif // BLADERUNNER_ORIGINAL_BUGS return true; case kGoalSteeleArrestIzo: @@ -802,9 +805,10 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) { Actor_Says(kActorSteele, 2140, kAnimationModeTalk); Actor_Says(kActorMcCoy, 4850, kAnimationModeTalk); Actor_Says(kActorSteele, 2150, kAnimationModeTalk); + // Scene_Exits_Enable() is done in Izo's kGoalIzoGetArrested - CompletedMovementTrack() case Actor_Set_Goal_Number(kActorIzo, kGoalIzoGetArrested); Actor_Set_Goal_Number(kActorSteele, kGoalSteeleLeaveRC03); - Actor_Set_Goal_Number(kActorSteele, kGoalSteeleDefault); + Actor_Set_Goal_Number(kActorSteele, kGoalSteeleDefault); // TODO - a bug? why set to default here? return true; case kGoalSteeleIzoBlockedByMcCoy: |