diff options
| author | Thanasis Antoniou | 2019-05-06 23:52:48 +0300 |
|---|---|---|
| committer | Thanasis Antoniou | 2019-05-06 23:53:43 +0300 |
| commit | 24bf47a28b317853f1c9175a8f22d6b4ba3ffc5f (patch) | |
| tree | 3ff0e64262e7294a23b727c4845207234e5e5041 /engines/bladerunner/script/scene/ma07.cpp | |
| parent | 9a510b1c4709e75559108d97c2807fba409ae657 (diff) | |
| download | scummvm-rg350-24bf47a28b317853f1c9175a8f22d6b4ba3ffc5f.tar.gz scummvm-rg350-24bf47a28b317853f1c9175a8f22d6b4ba3ffc5f.tar.bz2 scummvm-rg350-24bf47a28b317853f1c9175a8f22d6b4ba3ffc5f.zip | |
BLADERUNNER: Restoring Rachael related scenes pt1
Some testing and polishing of animations pending especially with meeting in Act 4
Diffstat (limited to 'engines/bladerunner/script/scene/ma07.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/ma07.cpp | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/engines/bladerunner/script/scene/ma07.cpp b/engines/bladerunner/script/scene/ma07.cpp index 83efc3533d..87a2063e73 100644 --- a/engines/bladerunner/script/scene/ma07.cpp +++ b/engines/bladerunner/script/scene/ma07.cpp @@ -54,6 +54,11 @@ void SceneScriptMA07::InitializeScene() { void SceneScriptMA07::SceneLoaded() { Obstacle_Object("BARRICADE", true); + if(_vm->_cutContent) { + if (Actor_Query_Goal_Number(kActorRachael) == kGoalRachaelShouldBeOutsideMcCoysAct3) { + Actor_Set_Goal_Number(kActorRachael, kGoalRachaelIsOutsideMcCoysBuildingAct3); + } + } } bool SceneScriptMA07::MouseClick(int x, int y) { @@ -134,9 +139,11 @@ void SceneScriptMA07::PlayerWalkedIn() { Game_Flag_Reset(kFlagPS14toMA07); } - if (Actor_Query_Goal_Number(kActorRachael) == 300) { - Actor_Set_Goal_Number(kActorRachael, 305); - } + if (Actor_Query_Goal_Number(kActorRachael) == kGoalRachaelIsOutsideMcCoysBuildingAct3) { + Actor_Set_Goal_Number(kActorRachael, kGoalRachaelIsOutWalksToPoliceHQAct3); + } else if (_vm->_cutContent && Actor_Query_Goal_Number(kActorRachael) == kGoalRachaelIsOutsideMcCoysBuildingAct4) { + Actor_Set_Goal_Number(kActorRachael, kGoalRachaelIsOutWalksToPoliceHQAct4); + } if (Game_Flag_Query(kFlagMA06toMA07)) { Game_Flag_Reset(kFlagMA06toMA07); @@ -166,6 +173,20 @@ void SceneScriptMA07::PlayerWalkedIn() { } void SceneScriptMA07::PlayerWalkedOut() { + if (_vm->_cutContent) { + if (Actor_Query_Goal_Number(kActorRachael) == kGoalRachaelIsOutsideMcCoysBuildingAct3 + || Actor_Query_Goal_Number(kActorRachael) == kGoalRachaelIsOutWalksToPoliceHQAct3 + || Actor_Query_Goal_Number(kActorRachael) == kGoalRachaelIsOutFleeingToPoliceHQAct3 + ) { + Actor_Set_Goal_Number(kActorRachael, kGoalRachaelAtEndOfAct3IfNotMetWithMcCoy); + } else if (Actor_Query_Goal_Number(kActorRachael) == kGoalRachaelIsOutResumesWalkToPoliceHQAct3) { + Actor_Set_Goal_Number(kActorRachael, kGoalRachaelAtEndOfAct3IfMetWithMcCoy); + } else if (Actor_Query_Goal_Number(kActorRachael) == kGoalRachaelIsOutsideMcCoysBuildingAct4 + || Actor_Query_Goal_Number(kActorRachael) == kGoalRachaelIsOutWalksToPoliceHQAct4 + ) { + Actor_Set_Goal_Number(kActorRachael, kGoalRachaelAtEndOfAct4); + } + } } void SceneScriptMA07::DialogueQueueFlushed(int a1) { |