diff options
author | Peter Kohaut | 2019-01-26 20:29:36 +0100 |
---|---|---|
committer | Peter Kohaut | 2019-01-27 11:49:00 +0100 |
commit | 2bea2307111c8ab1f072b899cbc4780f31ffd162 (patch) | |
tree | 2130c6431c1642388b240090d013b65c5536bc53 /engines/bladerunner/script/scene/hf02.cpp | |
parent | 2cf1d2e3f1d2e2e6f3f5364af6b3a383a71891c3 (diff) | |
download | scummvm-rg350-2bea2307111c8ab1f072b899cbc4780f31ffd162.tar.gz scummvm-rg350-2bea2307111c8ab1f072b899cbc4780f31ffd162.tar.bz2 scummvm-rg350-2bea2307111c8ab1f072b899cbc4780f31ffd162.zip |
BLADERUNNER: Initial cleanup of HF02 & HF03
Diffstat (limited to 'engines/bladerunner/script/scene/hf02.cpp')
-rw-r--r-- | engines/bladerunner/script/scene/hf02.cpp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/engines/bladerunner/script/scene/hf02.cpp b/engines/bladerunner/script/scene/hf02.cpp index c7a179587c..936b11fd2f 100644 --- a/engines/bladerunner/script/scene/hf02.cpp +++ b/engines/bladerunner/script/scene/hf02.cpp @@ -25,18 +25,20 @@ namespace BladeRunner { void SceneScriptHF02::InitializeScene() { - if (Game_Flag_Query(567)) { + if (Game_Flag_Query(kFlagHF04toHF03)) { Setup_Scene_Information(874.0f, 47.76f, -252.0f, 775); - Game_Flag_Reset(567); - } else if (Game_Flag_Query(528)) { + Game_Flag_Reset(kFlagHF04toHF03); + } else if (Game_Flag_Query(kFlagHF03toHF02)) { Setup_Scene_Information(470.0f, 47.76f, -500.0f, 560); } else { Setup_Scene_Information(-18.0f, 47.76f, -288.0f, 275); } - Scene_Exit_Add_2D_Exit(0, 0, 0, 30, 479, 3); + + Scene_Exit_Add_2D_Exit(0, 0, 0, 30, 479, 3); Scene_Exit_Add_2D_Exit(1, 207, 66, 272, 207, 3); + Ambient_Sounds_Add_Looping_Sound(340, 28, -100, 1); - Ambient_Sounds_Add_Looping_Sound(341, 33, 0, 1); + Ambient_Sounds_Add_Looping_Sound(341, 33, 0, 1); Ambient_Sounds_Add_Sound(181, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(182, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); Ambient_Sounds_Add_Sound(183, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0); @@ -84,7 +86,7 @@ bool SceneScriptHF02::ClickedOnItem(int itemId, bool a2) { bool SceneScriptHF02::ClickedOnExit(int exitId) { if (exitId == 0) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 42.0f, 47.76f, -296.0f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 42.0f, 47.76f, -296.0f, 0, true, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagHF02toHF01); @@ -92,11 +94,12 @@ bool SceneScriptHF02::ClickedOnExit(int exitId) { } return true; } + if (exitId == 1) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 470.0f, 47.76f, -444.0f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 470.0f, 47.76f, -444.0f, 0, true, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(527); + Game_Flag_Set(kFlagHF02toHF03); Set_Enter(kSetHF03, kSceneHF03); } return true; @@ -119,13 +122,15 @@ void SceneScriptHF02::PlayerWalkedIn() { if (Actor_Query_Goal_Number(kActorSteele) == 240) { Actor_Set_Goal_Number(kActorSteele, 241); } - if (Game_Flag_Query(528)) { - Loop_Actor_Walk_To_XYZ(kActorMcCoy, 470.0f, 47.76f, -444.0f, 0, 0, false, 0); - Game_Flag_Reset(528); + + if (Game_Flag_Query(kFlagHF03toHF02)) { + Loop_Actor_Walk_To_XYZ(kActorMcCoy, 470.0f, 47.76f, -444.0f, 0, false, false, 0); + Game_Flag_Reset(kFlagHF03toHF02); } else if (Game_Flag_Query(kFlagHF01toHF02)) { - Loop_Actor_Walk_To_XYZ(kActorMcCoy, 42.0f, 47.76f, -296.0f, 0, 0, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, 42.0f, 47.76f, -296.0f, 0, false, false, 0); Game_Flag_Reset(kFlagHF01toHF02); } + if (Actor_Query_Goal_Number(kActorSteele) == 243) { if (Actor_Query_Goal_Number(kActorLucy) == 599) { Actor_Set_Goal_Number(kActorSteele, 244); |