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

[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:
a8b7c9598f BLADERUNNER: RESTOREDCONTENT: Fix Rachael travelling in Act4


Commit: a8b7c9598f32b87334a1686bc8faf11bd1680c37
    https://github.com/scummvm/scummvm/commit/a8b7c9598f32b87334a1686bc8faf11bd1680c37
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2020-11-18T17:16:13+02:00

Commit Message:
BLADERUNNER: RESTOREDCONTENT: Fix Rachael travelling in Act4

She should not be moving or walking

She could still be waling when teleporting her to kSetFreeSlotG and subsequently when we put her in MA06 (elevator)

Changed paths:
    engines/bladerunner/script/ai/rachael.cpp
    engines/bladerunner/script/scene/ma06.cpp


diff --git a/engines/bladerunner/script/ai/rachael.cpp b/engines/bladerunner/script/ai/rachael.cpp
index dfacb5f473..b9d46819a4 100644
--- a/engines/bladerunner/script/ai/rachael.cpp
+++ b/engines/bladerunner/script/ai/rachael.cpp
@@ -185,6 +185,7 @@ bool AIScriptRachael::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		// added goal for restored content
 		// fall through
 	case kGoalRachaelAtEndOfAct3IfMetWithMcCoy:
+		AI_Movement_Track_Pause(kActorRachael);
 		Actor_Put_In_Set(kActorRachael, kSetFreeSlotG);
 		Actor_Set_At_Waypoint(kActorRachael, 39, 0);
 		break;
diff --git a/engines/bladerunner/script/scene/ma06.cpp b/engines/bladerunner/script/scene/ma06.cpp
index 3a67b573b9..ef664b957a 100644
--- a/engines/bladerunner/script/scene/ma06.cpp
+++ b/engines/bladerunner/script/scene/ma06.cpp
@@ -66,6 +66,7 @@ void SceneScriptMA06::SceneLoaded() {
 		} else if (Actor_Query_Goal_Number(kActorRachael) == kGoalRachaelAtEndOfAct3IfMetWithMcCoy
 			&& Game_Flag_Query(kFlagMA02RajifTalk)) {
 			// Put Rachael in set for her second cut scene (Act 4)
+			AI_Movement_Track_Pause(kActorRachael); // don't allow her to "travel" anywhere
 			Actor_Put_In_Set(kActorRachael, kSetMA06);
 			Actor_Set_At_XYZ(kActorRachael, 30.15f, 0.0f, 50.16f, 170); // different rotation and slightly different placement
 			Actor_Set_Goal_Number(kActorRachael, kGoalRachaelIsInsideMcCoysElevatorAct4);