From 9fa862c0f40f5d04ae7c520ae6fdd6797bc79b6a Mon Sep 17 00:00:00 2001
From: Thanasis Antoniou
Date: Sun, 30 Jun 2019 15:16:47 +0300
Subject: BLADERUNNER: Additional potential Bullet Bob's gun fix

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

(limited to 'engines/bladerunner')

diff --git a/engines/bladerunner/script/ai/generic_walker_a.cpp b/engines/bladerunner/script/ai/generic_walker_a.cpp
index be21ee6ab3..6cb363991e 100644
--- a/engines/bladerunner/script/ai/generic_walker_a.cpp
+++ b/engines/bladerunner/script/ai/generic_walker_a.cpp
@@ -47,6 +47,14 @@ void AIScriptGenericWalkerA::Initialize() {
 }
 
 bool AIScriptGenericWalkerA::Update() {
+#if !BLADERUNNER_ORIGINAL_BUGS
+	// extra check for possible fix of Bullet Bob's gun missing
+	if (Player_Query_Current_Set() == kSetRC04
+	    && Actor_Query_Goal_Number(kActorGenwalkerA) != kGoalGenwalkerABulletBobsTrackGun
+	) {
+		Actor_Set_Goal_Number(kActorGenwalkerA, kGoalGenwalkerABulletBobsTrackGun);
+	}
+#endif // !BLADERUNNER_ORIGINAL_BUGS
 	switch (Actor_Query_Goal_Number(kActorGenwalkerA)) {
 		case kGoalGenwalkerDefault:
 			if (prepareWalker()) {
@@ -75,6 +83,16 @@ void AIScriptGenericWalkerA::TimerExpired(int timer) {
 }
 
 void AIScriptGenericWalkerA::CompletedMovementTrack() {
+#if !BLADERUNNER_ORIGINAL_BUGS
+	// extra check for possible fix of Bullet Bob's gun missing
+	if (Player_Query_Current_Set() == kSetRC04
+	    && Actor_Query_Goal_Number(kActorGenwalkerA) != kGoalGenwalkerABulletBobsTrackGun
+	) {
+		Actor_Set_Goal_Number(kActorGenwalkerA, kGoalGenwalkerABulletBobsTrackGun);
+		return;
+	}
+#endif // !BLADERUNNER_ORIGINAL_BUGS
+
 	if (Actor_Query_Goal_Number(kActorGenwalkerA) > kGoalGenwalkerDefault) {
 		Actor_Set_Goal_Number(kActorGenwalkerA, kGoalGenwalkerDefault);
 		if (!Game_Flag_Query(kFlagGenericWalkerWaiting)) {
-- 
cgit v1.2.3