[Scummvm-git-logs] scummvm master -> eff108fdff5d531fdcf29b9cfa1e19470d2ecaec

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
eff108fdff BLADERUNNER: Fix soft lock case for Izo at HC01


Commit: eff108fdff5d531fdcf29b9cfa1e19470d2ecaec
    https://github.com/scummvm/scummvm/commit/eff108fdff5d531fdcf29b9cfa1e19470d2ecaec
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-08-14T14:10:44+03:00

Commit Message:
BLADERUNNER: Fix soft lock case for Izo at HC01

Fixes bug #15321

Prevents a soft lock if Izo is clicked for his final question before he reaches his waypoint outside of his pawn shop in Act 2.
This is also an original game bug.

Changed paths:
    engines/bladerunner/script/scene/hc01.cpp


diff --git a/engines/bladerunner/script/scene/hc01.cpp b/engines/bladerunner/script/scene/hc01.cpp
index 94948863a6e..3e5910c7c6b 100644
--- a/engines/bladerunner/script/scene/hc01.cpp
+++ b/engines/bladerunner/script/scene/hc01.cpp
@@ -136,7 +136,19 @@ bool SceneScriptHC01::ClickedOnActor(int actorId) {
 				dialogueWithIzo();
 			}
 		}
+#if BLADERUNNER_ORIGINAL_BUGS
 		AI_Movement_Track_Unpause(kActorIzo);
+#else
+		// NOTE If Izo has not finished his path, before McCoy asks him the final question
+		// which makes him take the photo, then he would play the animation of getting the camera (kGoalIzoPrepareCamera)
+		// but then would not take the photo, but instead walk to the end of his path (due to this Upause() call)
+		// and the game would soft lock (original game bug).
+		// See bug report ticket (trac): #15321
+		//
+		if (Actor_Query_Goal_Number(kActorIzo) != kGoalIzoTakePhoto) {
+			AI_Movement_Track_Unpause(kActorIzo);
+		}
+#endif // BLADERUNNER_ORIGINAL_BUGS
 	}
 #if BLADERUNNER_ORIGINAL_BUGS
 #else