aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThanasis Antoniou2019-06-26 19:38:00 +0300
committerThanasis Antoniou2019-06-26 19:38:00 +0300
commit378f1863271fd5df3051f49a883fcef23f4f85fa (patch)
treee00146e3040380a6f14ed3069a818e5f88588a67
parent2d4dffdac0dc251d252bbc1ec6205546b9ac44b9 (diff)
downloadscummvm-rg350-378f1863271fd5df3051f49a883fcef23f4f85fa.tar.gz
scummvm-rg350-378f1863271fd5df3051f49a883fcef23f4f85fa.tar.bz2
scummvm-rg350-378f1863271fd5df3051f49a883fcef23f4f85fa.zip
BLADERUNNER: McCoy should holster his gun in MA07 when Gaff is there
-rw-r--r--engines/bladerunner/script/scene/ma07.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/bladerunner/script/scene/ma07.cpp b/engines/bladerunner/script/scene/ma07.cpp
index 9b67446fb1..e821fc3c2b 100644
--- a/engines/bladerunner/script/scene/ma07.cpp
+++ b/engines/bladerunner/script/scene/ma07.cpp
@@ -154,6 +154,11 @@ void SceneScriptMA07::PlayerWalkedIn() {
&& Global_Variable_Query(kVariableChapter) == 4
) {
Scene_Exits_Disable();
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+ // don't have McCoy with his gun drawn out when talking to Gaff here
+ Player_Set_Combat_Mode(false);
+#endif // BLADERUNNER_ORIGINAL_BUGS
Actor_Set_Goal_Number(kActorGaff, kGoalGaffMA07Wait);
}