Skip to content
Permalink
Browse files

BLADERUNNER: Remove redundant call to playerGainsControl

When Steele retires Izo in RC03
  • Loading branch information...
antoniou79 committed May 21, 2019
1 parent 0def58f commit d2b8f9284caa2e8e1e632b8382875c3f2b90c257
Showing with 6 additions and 2 deletions.
  1. +6 −2 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:

0 comments on commit d2b8f92

Please sign in to comment.
You can’t perform that action at this time.