diff options
author | Thanasis Antoniou | 2019-06-28 15:03:36 +0300 |
---|---|---|
committer | Thanasis Antoniou | 2019-06-28 15:30:43 +0300 |
commit | 54ad2c9aaff9aafdda9392133ecb64aa8a2b8b34 (patch) | |
tree | fb41696efb78a16aea3261aef1df91dadea8856d /engines | |
parent | 543b9cb114b8fc2d094c4f251eae43a675c21ba1 (diff) | |
download | scummvm-rg350-54ad2c9aaff9aafdda9392133ecb64aa8a2b8b34.tar.gz scummvm-rg350-54ad2c9aaff9aafdda9392133ecb64aa8a2b8b34.tar.bz2 scummvm-rg350-54ad2c9aaff9aafdda9392133ecb64aa8a2b8b34.zip |
BLADERUNNER: Avoid freeze in Gordo scene at CT05
If McCoy re-climbs the stairs immediately after retiring Zuben and having picked up the photo
Diffstat (limited to 'engines')
-rw-r--r-- | engines/bladerunner/script/ai/gordo.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp index 2ebac44f6c..7923c0f108 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); |