BLADERUNNER: Avoid freeze in Gordo scene at CT05

If McCoy re-climbs the stairs immediately after retiring Zuben and having picked up the photo
scummvm · Jun 28, 2019 · 54ad2c9 · 54ad2c9
1 parent 543b9cb
commit 54ad2c9
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp
@@ -121,7 +121,13 @@ void AIScriptGordo::CompletedMovementTrack() {
 	}
 
 	if (Actor_Query_Goal_Number(kActorGordo) == kGoalGordoCT05WalkThrough) {
-		if (Player_Query_Current_Set() == kSetCT05) {
+		if (Player_Query_Current_Set() == kSetCT05
+#if !BLADERUNNER_ORIGINAL_BUGS
+		    // prevent this dialogue scene if McCoy is climbing the stairs up-again
+		    // to avoid a game freeze bug
+		    && _vm->playerHasControl()
+#endif
+		) {
 			Actor_Force_Stop_Walking(kActorMcCoy);
 			Player_Loses_Control();
 			Player_Set_Combat_Mode(true);