From 96a8b91fbec2d710e9805b8edf14167b24d438fa Mon Sep 17 00:00:00 2001
From: Thanasis Antoniou
Date: Thu, 11 Jul 2019 00:54:37 +0300
Subject: BLADERUNNER: Spinner outtake bug in CT01 start of Act3

---
 engines/bladerunner/script/scene/ct08.cpp | 2 ++
 engines/bladerunner/script/scene/ct12.cpp | 7 +++++++
 engines/bladerunner/script/scene/tb02.cpp | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/engines/bladerunner/script/scene/ct08.cpp b/engines/bladerunner/script/scene/ct08.cpp
index 8fb856941e..0de18aac46 100644
--- a/engines/bladerunner/script/scene/ct08.cpp
+++ b/engines/bladerunner/script/scene/ct08.cpp
@@ -192,6 +192,8 @@ void SceneScriptCT08::PlayerWalkedIn() {
 		Game_Flag_Reset(kFlagCT06toCT08);
 #if BLADERUNNER_ORIGINAL_BUGS
 #else
+		// The player is now (teleported) in Chinatown (CT08) but the flag was not set here
+		Game_Flag_Set(kFlagMcCoyInChinaTown);
 		// if player clicked through fast enough in BB roof encounter, the fight music would be (auto-)saved here
 		// and would be restored when loading the auto-save
 		Music_Stop(0);
diff --git a/engines/bladerunner/script/scene/ct12.cpp b/engines/bladerunner/script/scene/ct12.cpp
index 4a47348cf2..ac8e705ea7 100644
--- a/engines/bladerunner/script/scene/ct12.cpp
+++ b/engines/bladerunner/script/scene/ct12.cpp
@@ -342,6 +342,13 @@ void SceneScriptCT12::PlayerWalkedOut() {
 		Game_Flag_Reset(kFlagMcCoyInChinaTown);
 		Game_Flag_Set(kFlagMcCoyInUnderground);
 	}
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+	// this enforces existing awry saved games from having a bad flag value
+	else {
+		Game_Flag_Set(kFlagMcCoyInChinaTown);
+	}
+#endif // BLADERUNNER_ORIGINAL_BUGS
 }
 
 void SceneScriptCT12::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/tb02.cpp b/engines/bladerunner/script/scene/tb02.cpp
index cf3914bac6..28c84d526b 100644
--- a/engines/bladerunner/script/scene/tb02.cpp
+++ b/engines/bladerunner/script/scene/tb02.cpp
@@ -389,7 +389,7 @@ void SceneScriptTB02::PlayerWalkedOut() {
 	    && !Game_Flag_Query(kFlagMcCoyInTyrellBuilding)
 	) {
 		// Acts 2, 3 - use a spinner fly-through transition
-		Outtake_Play(kOuttakeTowards3, true, -1);  // available in Acts 1, 2, 3
+		Outtake_Play(kOuttakeTowards3, true, -1); // available in Acts 1, 2, 3
 	}
 #endif // BLADERUNNER_ORIGINAL_BUGS
 }
-- 
cgit v1.2.3