diff options
| author | Peter Kohaut | 2019-02-03 00:08:49 +0100 |
|---|---|---|
| committer | Peter Kohaut | 2019-02-03 00:14:09 +0100 |
| commit | 95f42fde63ad09a6684ce62659273228f0b83e46 (patch) | |
| tree | 46011a9e313adc1c987957d9a7f296118038e355 /engines/bladerunner/script/scene/kp04.cpp | |
| parent | f2d76c2d7162d8b3e514c6cb6f865ef527e037a2 (diff) | |
| download | scummvm-rg350-95f42fde63ad09a6684ce62659273228f0b83e46.tar.gz scummvm-rg350-95f42fde63ad09a6684ce62659273228f0b83e46.tar.bz2 scummvm-rg350-95f42fde63ad09a6684ce62659273228f0b83e46.zip | |
BLADERUNNER: Initial cleanup of Kipple scripts
Diffstat (limited to 'engines/bladerunner/script/scene/kp04.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/kp04.cpp | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/engines/bladerunner/script/scene/kp04.cpp b/engines/bladerunner/script/scene/kp04.cpp index 4c138a1962..4de125d5bd 100644 --- a/engines/bladerunner/script/scene/kp04.cpp +++ b/engines/bladerunner/script/scene/kp04.cpp @@ -25,25 +25,26 @@ namespace BladeRunner { void SceneScriptKP04::InitializeScene() { - if (Game_Flag_Query(575)) { - Setup_Scene_Information(-544.0f, 94.89f, 288.0f, 700); + if (Game_Flag_Query(kFlagKP05toKP04)) { + Setup_Scene_Information(-544.0f, 94.89f, 288.0f, 700); } else { Setup_Scene_Information(-905.0f, 94.89f, 1357.0f, 970); } - Scene_Exit_Add_2D_Exit(0, 0, 455, 639, 479, 2); + Scene_Exit_Add_2D_Exit(0, 0, 455, 639, 479, 2); Scene_Exit_Add_2D_Exit(1, 475, 247, 514, 416, 1); + 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 SceneScriptKP04::SceneLoaded() { @@ -70,7 +71,7 @@ bool SceneScriptKP04::ClickedOnItem(int itemId, bool a2) { bool SceneScriptKP04::ClickedOnExit(int exitId) { if (exitId == 0) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -905.0f, 94.89f, 1357.0f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -905.0f, 94.89f, 1357.0f, 0, true, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(416); @@ -78,11 +79,12 @@ bool SceneScriptKP04::ClickedOnExit(int exitId) { } return true; } + if (exitId == 1) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -544.0f, 94.89f, 288.0f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -544.0f, 94.89f, 288.0f, 0, true, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Game_Flag_Set(574); + Game_Flag_Set(kFlagKP04toKP05); Set_Enter(kSetKP05_KP06, kSceneKP05); } return true; @@ -101,11 +103,11 @@ void SceneScriptKP04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo } void SceneScriptKP04::PlayerWalkedIn() { - if (Game_Flag_Query(575)) { - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -584.0f, 94.89f, 288.0f, 0, 0, false, 0); - Game_Flag_Reset(575); + if (Game_Flag_Query(kFlagKP05toKP04)) { + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -584.0f, 94.89f, 288.0f, 0, false, false, 0); + Game_Flag_Reset(kFlagKP05toKP04); } else { - Game_Flag_Reset(415); + Game_Flag_Reset(kFlagKP01toKP04); } } |