BLADERUNNER: Complementary fix for scorpion cage

2 files changed, 15 insertions, 0 deletions

diff --git a/engines/bladerunner/script/ai/dektora.cpp b/engines/bladerunner/script/ai/dektora.cpp
index 0d76f10b2c..94bdfe37e3 100644
--- a/engines/bladerunner/script/ai/dektora.cpp
+++ b/engines/bladerunner/script/ai/dektora.cpp
@@ -56,10 +56,18 @@ bool AIScriptDektora::Update() {
 			 &&  Player_Query_Current_Scene() != kSceneAR01
 			 &&  Player_Query_Current_Scene() != kSceneAR02
 			) {
+#if BLADERUNNER_ORIGINAL_BUGS
 				if (Game_Flag_Query(kFlagAR02Entered)) {
 					Item_Remove_From_World(kItemScorpions);
 				}
 				Game_Flag_Set(kFlagAR02DektoraBoughtScorpions);
+#else
+				if (Game_Flag_Query(kFlagScorpionsInAR02)) {
+					Item_Remove_From_World(kItemScorpions);
+					Game_Flag_Reset(kFlagScorpionsInAR02);
+				}
+				Game_Flag_Set(kFlagAR02DektoraBoughtScorpions);
+#endif
 			}
 		}
 		return true;
diff --git a/engines/bladerunner/script/ai/insect_dealer.cpp b/engines/bladerunner/script/ai/insect_dealer.cpp
index 245aebbafe..41e2c26dc2 100644
--- a/engines/bladerunner/script/ai/insect_dealer.cpp
+++ b/engines/bladerunner/script/ai/insect_dealer.cpp
@@ -113,7 +113,14 @@ bool AIScriptInsectDealer::GoalChanged(int currentGoalNumber, int newGoalNumber)
 
 		if (!Game_Flag_Query(kFlagAR02DektoraBoughtScorpions)) {
 			Game_Flag_Set(kFlagAR02DektoraBoughtScorpions);
+#if BLADERUNNER_ORIGINAL_BUGS
 			Item_Remove_From_World(kItemScorpions);
+#else
+			if (Game_Flag_Query(kFlagScorpionsInAR02)) {
+				Game_Flag_Reset(kFlagScorpionsInAR02);
+				Item_Remove_From_World(kItemScorpions);
+			}
+#endif
 		}
 	}