diff options
| -rw-r--r-- | engines/bladerunner/script/ai/dektora.cpp | 9 | ||||
| -rw-r--r-- | engines/bladerunner/script/ai/early_q.cpp | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/engines/bladerunner/script/ai/dektora.cpp b/engines/bladerunner/script/ai/dektora.cpp index 53678e3c83..70b081f60e 100644 --- a/engines/bladerunner/script/ai/dektora.cpp +++ b/engines/bladerunner/script/ai/dektora.cpp @@ -83,10 +83,17 @@ bool AIScriptDektora::Update() { break; case kGoalDektoraNR11BurningGoToMcCoy: +#if BLADERUNNER_ORIGINAL_BUGS if (Actor_Query_Inch_Distance_From_Actor(kActorDektora, kActorMcCoy) <= 48) { Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR11BurningFallToNR10); break; } +#else + if (Actor_Query_Inch_Distance_From_Actor(kActorDektora, kActorMcCoy) <= 54) { + Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR11BurningFallToNR10); + break; + } +#endif // BLADERUNNER_ORIGINAL_BUGS if (comp_distance(kActorMcCoy, _x, _y, _z) > 12.0f) { Actor_Query_XYZ(kActorMcCoy, &_x, &_y, &_z); @@ -511,7 +518,9 @@ bool AIScriptDektora::GoalChanged(int currentGoalNumber, int newGoalNumber) { break; case kGoalDektoraNR11PrepareBurning: + // fall through case kGoalDektoraNR11BurningGoToMcCoy: + // fall through case kGoalDektoraGone: break; // return true diff --git a/engines/bladerunner/script/ai/early_q.cpp b/engines/bladerunner/script/ai/early_q.cpp index c566f4eb10..1d98e98453 100644 --- a/engines/bladerunner/script/ai/early_q.cpp +++ b/engines/bladerunner/script/ai/early_q.cpp @@ -395,7 +395,7 @@ bool AIScriptEarlyQ::GoalChanged(int currentGoalNumber, int newGoalNumber) { case kGoalEarlyQNR04HandDrink: if (Actor_Query_Inch_Distance_From_Actor(kActorMcCoy, kActorEarlyQ) > 36) { - Loop_Actor_Walk_To_Actor(kActorEarlyQ, kActorMcCoy, 36, kActorMcCoy, kActorMcCoy); + Loop_Actor_Walk_To_Actor(kActorEarlyQ, kActorMcCoy, 36, false, false); } Actor_Face_Actor(kActorMcCoy, kActorEarlyQ, true); Actor_Face_Actor(kActorEarlyQ, kActorMcCoy, true); |