diff options
Diffstat (limited to 'engines/bladerunner/script/scene/kp05.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/kp05.cpp | 58 |
1 files changed, 32 insertions, 26 deletions
diff --git a/engines/bladerunner/script/scene/kp05.cpp b/engines/bladerunner/script/scene/kp05.cpp index d2726060a2..03f3fb24ee 100644 --- a/engines/bladerunner/script/scene/kp05.cpp +++ b/engines/bladerunner/script/scene/kp05.cpp @@ -25,28 +25,30 @@ namespace BladeRunner { void SceneScriptKP05::InitializeScene() { - if (Game_Flag_Query(577)) { - Setup_Scene_Information(-868.0f, 0.0f, -68.0f, 520); - } else if (Game_Flag_Query(574)) { + if (Game_Flag_Query(kFlagKP06toKP05)) { + Setup_Scene_Information( -868.0f, 0.0f, -68.0f, 520); + } else if (Game_Flag_Query(kFlagKP04toKP05)) { Setup_Scene_Information(-1142.0f, 0.0f, 932.0f, 276); } else { - Setup_Scene_Information(-802.0f, 0.0f, 972.0f, 800); + Setup_Scene_Information( -802.0f, 0.0f, 972.0f, 800); } + Scene_Exit_Add_2D_Exit(0, 589, 0, 639, 479, 1); - Scene_Exit_Add_2D_Exit(1, 0, 0, 30, 479, 3); - Scene_Exit_Add_2D_Exit(2, 0, 0, 257, 204, 0); + Scene_Exit_Add_2D_Exit(1, 0, 0, 30, 479, 3); + Scene_Exit_Add_2D_Exit(2, 0, 0, 257, 204, 0); + Ambient_Sounds_Add_Looping_Sound(464, 34, 1, 1); Ambient_Sounds_Add_Looping_Sound(383, 27, 1, 1); Ambient_Sounds_Add_Looping_Sound(384, 90, 1, 1); - Ambient_Sounds_Add_Sound(440, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); - Ambient_Sounds_Add_Sound(441, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); - Ambient_Sounds_Add_Sound(442, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(440, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(441, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(442, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(375, 5, 180, 50, 100, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(376, 5, 180, 50, 100, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(377, 5, 180, 50, 100, -100, 100, -101, -101, 0, 0); - Ambient_Sounds_Add_Sound(443, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); - Ambient_Sounds_Add_Sound(444, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); - Ambient_Sounds_Add_Sound(445, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(443, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(444, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); + Ambient_Sounds_Add_Sound(445, 2, 100, 25, 33, -100, 100, -101, -101, 0, 0); } void SceneScriptKP05::SceneLoaded() { @@ -72,7 +74,7 @@ bool SceneScriptKP05::ClickedOnActor(int actorId) { bool SceneScriptKP05::ClickedOnItem(int itemId, bool a2) { if (itemId == 118) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1058.0f, 0.0f, 852.0f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1058.0f, 0.0f, 852.0f, 0, true, false, 0)) { Actor_Face_Item(kActorMcCoy, 118, true); Actor_Clue_Acquire(kActorMcCoy, kCluePowerSource, true, -1); Item_Remove_From_World(118); @@ -84,28 +86,30 @@ bool SceneScriptKP05::ClickedOnItem(int itemId, bool a2) { bool SceneScriptKP05::ClickedOnExit(int exitId) { if (exitId == 0) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -802.0f, 0.0f, 972.0f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -802.0f, 0.0f, 972.0f, 0, true, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(420); + Game_Flag_Set(kFlagKP05toKP03); Set_Enter(kSetKP03, kSceneKP03); } return true; } + if (exitId == 1) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1142.0f, 0.0f, 932.0f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1142.0f, 0.0f, 932.0f, 0, true, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(575); + Game_Flag_Set(kFlagKP05toKP04); Set_Enter(kSetKP04, kSceneKP04); } return true; } + if (exitId == 2) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -868.0f, 0.0f, -68.0f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -868.0f, 0.0f, -68.0f, 0, true, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(576); + Game_Flag_Set(kFlagKP05toKP06); Async_Actor_Walk_To_XYZ(kActorMcCoy, -868.0f, 0.0f, -216.0f, 0, false); Set_Enter(kSetKP05_KP06, kSceneKP06); } @@ -125,18 +129,20 @@ void SceneScriptKP05::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo } void SceneScriptKP05::PlayerWalkedIn() { - if (Game_Flag_Query(577)) { - Game_Flag_Reset(577); - } else if (Game_Flag_Query(574)) { - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1110.0f, 0.0f, 932.0f, 0, 0, false, 0); - Game_Flag_Reset(574); + if (Game_Flag_Query(kFlagKP06toKP05)) { + Game_Flag_Reset(kFlagKP06toKP05); + } else if (Game_Flag_Query(kFlagKP04toKP05)) { + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1110.0f, 0.0f, 932.0f, 0, false, false, 0); + Game_Flag_Reset(kFlagKP04toKP05); } else { - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -846.0f, 0.0f, 972.0f, 0, 0, false, 0); - Game_Flag_Query(419); // bug in game? + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -846.0f, 0.0f, 972.0f, 0, false, false, 0); + Game_Flag_Query(kFlagKP03toKP05); // bug in game? } + if (Actor_Query_Goal_Number(kActorMaggie) == 411) { Actor_Set_Goal_Number(kActorMaggie, 412); } + if (Actor_Query_Goal_Number(kActorSteele) == 450) { Scene_Exits_Disable(); Actor_Face_Actor(kActorSteele, kActorMcCoy, true); |