From 54ad2c9aaff9aafdda9392133ecb64aa8a2b8b34 Mon Sep 17 00:00:00 2001 From: Thanasis Antoniou Date: Fri, 28 Jun 2019 15:03:36 +0300 Subject: [PATCH] BLADERUNNER: Avoid freeze in Gordo scene at CT05 If McCoy re-climbs the stairs immediately after retiring Zuben and having picked up the photo --- engines/bladerunner/script/ai/gordo.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp index 2ebac44f6c7..7923c0f108c 100644 --- 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);