From 4cd7c3d19fd2cdf043c4cade221683b24b0e2afd Mon Sep 17 00:00:00 2001
From: Thanasis Antoniou
Date: Wed, 1 May 2019 08:57:15 +0300
Subject: BLADERUNNER: Fix interaction with transient about locked door

---
 engines/bladerunner/script/ai/transient.cpp | 3 +++
 engines/bladerunner/script/scene/ug13.cpp   | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'engines/bladerunner')

diff --git a/engines/bladerunner/script/ai/transient.cpp b/engines/bladerunner/script/ai/transient.cpp
index 8fefc8e973..0210781eab 100644
--- a/engines/bladerunner/script/ai/transient.cpp
+++ b/engines/bladerunner/script/ai/transient.cpp
@@ -199,6 +199,7 @@ bool AIScriptTransient::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Actor_Set_At_Waypoint(kActorTransient, 40, 0);
 		return true;
 	case 390:
+		// laying on the couch - not sleeping
 		Actor_Put_In_Set(kActorTransient, kSetUG13);
 		Actor_Set_At_XYZ(kActorTransient, -310.0, 55.0, -350.0, 400);
 		Actor_Change_Animation_Mode(kActorTransient, 53);
@@ -206,9 +207,11 @@ bool AIScriptTransient::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Game_Flag_Set(kFlagUG13HomelessLayingdown);
 		return true;
 	case 391:
+		// laying on the couch - sleeping - dialogue exhausted pre-flask - awaiting flask
 		Actor_Change_Animation_Mode(kActorTransient, 53);
 		return true;
 	case 395:
+		// laying on the couch - sleeping - post flask
 		Actor_Change_Animation_Mode(kActorTransient, 55);
 		AI_Countdown_Timer_Start(kActorTransient, kActorTimerAIScriptCustomTask0, Random_Query(30, 40));
 		return true;
diff --git a/engines/bladerunner/script/scene/ug13.cpp b/engines/bladerunner/script/scene/ug13.cpp
index 15ab79ecee..f2e43c88e3 100644
--- a/engines/bladerunner/script/scene/ug13.cpp
+++ b/engines/bladerunner/script/scene/ug13.cpp
@@ -222,7 +222,10 @@ bool SceneScriptUG13::ClickedOnExit(int exitId) {
 				if (!Game_Flag_Query(kFlagCallWithGuzza)) {
 					// Passage to UG18 is locked
 					// This two lines of dialogue is not in the code of the original game
-					if (Actor_Query_Goal_Number(kActorTransient) == 395) {
+					if (Actor_Query_Goal_Number(kActorTransient) == 391
+					    || Actor_Query_Goal_Number(kActorTransient) == 395
+					    || Actor_Query_Goal_Number(kActorTransient) == 599
+					) {
 						Actor_Says(kActorMcCoy, 8522, 14); // Locked
 					} else {
 						Actor_Says(kActorMcCoy, 5555, 14); // How do I get this thing open?
-- 
cgit v1.2.3