From 72329773d449e0abe36b4dde45aab3927f0677ea Mon Sep 17 00:00:00 2001
From: Thanasis Antoniou
Date: Fri, 28 Jun 2019 18:35:42 +0300
Subject: BLADERUNNER: Possible gun blinking out fix

---
 engines/bladerunner/script/ai/generic_walker_a.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/bladerunner/script/ai/generic_walker_a.cpp b/engines/bladerunner/script/ai/generic_walker_a.cpp
index 09be4167c1..be21ee6ab3 100644
--- a/engines/bladerunner/script/ai/generic_walker_a.cpp
+++ b/engines/bladerunner/script/ai/generic_walker_a.cpp
@@ -185,6 +185,10 @@ bool AIScriptGenericWalkerA::GoalChanged(int currentGoalNumber, int newGoalNumbe
 		return true;
 	} else if (newGoalNumber == kGoalGenwalkerABulletBobsTrackGun) {
 		// Bullet Bob's tracking gun
+#if !BLADERUNNER_ORIGINAL_BUGS
+		// Possible bug fix for disappearing gun - don't allow track complete events to interfere with Gun state
+		AI_Movement_Track_Flush(kActorGenwalkerA);
+#endif
 		Actor_Put_In_Set(kActorGenwalkerA, kSetRC04);
 		Actor_Set_At_XYZ(kActorGenwalkerA, 0.0, 36.0, -172.0, 491);
 		Actor_Change_Animation_Mode(kActorGenwalkerA, kAnimationModeCombatIdle);
-- 
cgit v1.2.3