From cd6ebdc88b1c33b657c1ae27b97114a5b891b8ab Mon Sep 17 00:00:00 2001
From: Thanasis Antoniou
Date: Mon, 9 Sep 2019 22:01:36 +0300
Subject: BLADERUNNER: Allow McCoy to perform both turns when feeding Maggie

First animated turn is to the counter, second is towards Maggie
---
 engines/bladerunner/script/ai/maggie.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'engines/bladerunner')

diff --git a/engines/bladerunner/script/ai/maggie.cpp b/engines/bladerunner/script/ai/maggie.cpp
index a31c5be76f..5e6143dbb3 100644
--- a/engines/bladerunner/script/ai/maggie.cpp
+++ b/engines/bladerunner/script/ai/maggie.cpp
@@ -271,6 +271,17 @@ bool AIScriptMaggie::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case kGoalMaggieMA02GetFed:
 		Player_Loses_Control();
 		AI_Movement_Track_Flush(kActorMaggie);
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+		// Allows McCoy to perform both animated turns (first towards the BAR-MAIN and then towards Maggie)
+		// when Maggie is already too close
+		// original bug: When Maggie is close McCoy would alternate between
+		// - turning to Maggie and throw food at her
+		// - only performing the turn toward the BAR-MAIN and "throw" food to wrong direction
+		if (Actor_Query_Inch_Distance_From_Actor(kActorMaggie, kActorMcCoy) <= 85) {
+			Delay(500);
+		}
+#endif // BLADERUNNER_ORIGINAL_BUGS
 		Loop_Actor_Walk_To_Actor(kActorMaggie, kActorMcCoy, 48, false, false);
 		Actor_Face_Actor(kActorMcCoy, kActorMaggie, true);
 		Actor_Face_Actor(kActorMaggie, kActorMcCoy, false);
-- 
cgit v1.2.3