diff options
Diffstat (limited to 'engines/bladerunner/script/scene/hf01.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/hf01.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/engines/bladerunner/script/scene/hf01.cpp b/engines/bladerunner/script/scene/hf01.cpp index a1560f1944..764a4d536f 100644 --- a/engines/bladerunner/script/scene/hf01.cpp +++ b/engines/bladerunner/script/scene/hf01.cpp @@ -143,7 +143,7 @@ bool SceneScriptHF01::ClickedOnActor(int actorId) { Async_Actor_Walk_To_XYZ(v1, -175.0f, 8.0f, -617.0f, 0, false); Loop_Actor_Walk_To_XYZ(kActorMcCoy, -137.0f, 8.0f, -577.0f, 0, 0, false, 1); Game_Flag_Set(312); - Set_Enter(41, 38); + Set_Enter(41, kSceneHF05); } } } @@ -158,7 +158,7 @@ bool SceneScriptHF01::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -202.0f, 8.0f, -619.0f, 0, 1, false, 0)) { Game_Flag_Set(312); - Set_Enter(41, 38); + Set_Enter(41, kSceneHF05); } return true; } @@ -166,7 +166,7 @@ bool SceneScriptHF01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 124.0f, 8.0f, -724.0f, 0, 1, false, 0)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, 124.0f, 8.0f, -880.0f, 0, 0, false, 0); Game_Flag_Set(310); - Set_Enter(39, 36); + Set_Enter(39, kSceneHF03); } return true; } @@ -174,7 +174,7 @@ bool SceneScriptHF01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 406.0f, 8.0f, -717.0f, 0, 1, false, 0)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, 406.0f, 8.0f, -813.0f, 0, 0, false, 0); Game_Flag_Set(308); - Set_Enter(38, 35); + Set_Enter(38, kSceneHF02); } return true; } @@ -192,63 +192,63 @@ bool SceneScriptHF01::ClickedOnExit(int exitId) { Game_Flag_Set(178); Game_Flag_Reset(256); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 4, 1); break; case 1: Game_Flag_Set(179); Game_Flag_Reset(256); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 4, 1); break; case 2: Game_Flag_Set(182); Game_Flag_Reset(256); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 4, 1); break; case 3: Game_Flag_Set(176); Game_Flag_Reset(256); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 4, 1); break; case 5: Game_Flag_Set(261); Game_Flag_Reset(256); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 4, 1); break; case 4: Game_Flag_Set(180); Game_Flag_Reset(256); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 4, 1); break; case 7: Game_Flag_Set(258); Game_Flag_Reset(256); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 4, 1); break; case 6: Game_Flag_Set(177); Game_Flag_Reset(256); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 4, 1); break; case 8: Game_Flag_Set(181); Game_Flag_Reset(256); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 4, 1); break; default: @@ -353,8 +353,8 @@ void SceneScriptHF01::PlayerWalkedOut() { if (!Game_Flag_Query(312) && !Game_Flag_Query(308) && !Game_Flag_Query(310) && !Game_Flag_Query(722)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(35, 1, -1); - Outtake_Play(38, 1, -1); + Outtake_Play(kOuttakeInside2, true, -1); + Outtake_Play(kOuttakeTowards3, true, -1); } Game_Flag_Reset(722); if (Actor_Query_Goal_Number(kActorLucy) == 450) { |