diff options
Diffstat (limited to 'engines/bladerunner/script/scene')
110 files changed, 408 insertions, 409 deletions
diff --git a/engines/bladerunner/script/scene/ar01.cpp b/engines/bladerunner/script/scene/ar01.cpp index d63679b093..080f67a5e4 100644 --- a/engines/bladerunner/script/scene/ar01.cpp +++ b/engines/bladerunner/script/scene/ar01.cpp @@ -172,7 +172,7 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) { Game_Flag_Set(464); Game_Flag_Reset(180); Game_Flag_Set(479); - Set_Enter(8, 31); + Set_Enter(8, kSceneHC01); Actor_Set_Goal_Number(kActorFishDealer, 3); } return true; @@ -181,7 +181,7 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -182.0, 0.0, -551.0, 0, 1, false, 0)) { Game_Flag_Set(320); Async_Actor_Walk_To_XYZ(kActorMcCoy, -222.0, 0.0, -690.0, 0, false); - Set_Enter(0, 1); + Set_Enter(0, kSceneAR02); Actor_Set_Goal_Number(kActorFishDealer, 3); } return true; @@ -229,63 +229,63 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) { Game_Flag_Set(178); Game_Flag_Reset(252); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 5, 1); break; case 1: Game_Flag_Set(179); Game_Flag_Reset(252); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 5, 1); break; case 2: Game_Flag_Set(182); Game_Flag_Reset(252); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 5, 1); break; case 3: Game_Flag_Set(176); Game_Flag_Reset(252); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 5, 1); break; case 5: Game_Flag_Set(261); Game_Flag_Reset(252); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 5, 1); break; case 6: Game_Flag_Set(177); Game_Flag_Reset(252); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 5, 1); break; case 7: Game_Flag_Set(258); Game_Flag_Reset(252); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 5, 1); break; case 8: Game_Flag_Set(181); Game_Flag_Reset(252); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 5, 1); break; case 9: Game_Flag_Set(257); Game_Flag_Reset(252); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 5, 1); break; default: @@ -351,7 +351,7 @@ void SceneScriptAR01::PlayerWalkedOut() { if (!Game_Flag_Query(322) && !Game_Flag_Query(320)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(38, 1, -1); + Outtake_Play(kOuttakeTowards3, true, -1); } } diff --git a/engines/bladerunner/script/scene/ar02.cpp b/engines/bladerunner/script/scene/ar02.cpp index 0d81c31b8b..614f345076 100644 --- a/engines/bladerunner/script/scene/ar02.cpp +++ b/engines/bladerunner/script/scene/ar02.cpp @@ -201,7 +201,7 @@ bool SceneScriptAR02::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -182.0f, 0.0f, -551.0f, 0, 1, false, 0)) { Game_Flag_Set(321); Async_Actor_Walk_To_XYZ(kActorMcCoy, -182.0f, 0.0f, -407.0f, 0, false); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); } return true; } @@ -212,7 +212,7 @@ bool SceneScriptAR02::ClickedOnExit(int exitId) { Game_Flag_Reset(180); Game_Flag_Set(182); Music_Stop(3); - Set_Enter(70, 80); + Set_Enter(70, kSceneRC03); } return true; } diff --git a/engines/bladerunner/script/scene/bb01.cpp b/engines/bladerunner/script/scene/bb01.cpp index b5728430da..2c746a769c 100644 --- a/engines/bladerunner/script/scene/bb01.cpp +++ b/engines/bladerunner/script/scene/bb01.cpp @@ -90,14 +90,14 @@ bool SceneScriptBB01::ClickedOnExit(int exitId) { Game_Flag_Set(264); Game_Flag_Reset(258); Game_Flag_Set(177); - Set_Enter(7, 26); + Set_Enter(7, kSceneDR02); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -125.39f, 9.0f, 372.45f, 0, 1, false, 0)) { Game_Flag_Set(262); - Set_Enter(1, 3); + Set_Enter(1, kSceneBB02); } return true; } @@ -114,63 +114,63 @@ bool SceneScriptBB01::ClickedOnExit(int exitId) { Game_Flag_Set(178); Game_Flag_Reset(254); 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(254); 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(254); 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(254); 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(254); 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(254); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 4, 1); break; case 6: Game_Flag_Set(177); Game_Flag_Reset(254); 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(254); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 4, 1); break; case 9: Game_Flag_Set(257); Game_Flag_Reset(254); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 4, 1); break; default: diff --git a/engines/bladerunner/script/scene/bb02.cpp b/engines/bladerunner/script/scene/bb02.cpp index d238617a33..cd182003aa 100644 --- a/engines/bladerunner/script/scene/bb02.cpp +++ b/engines/bladerunner/script/scene/bb02.cpp @@ -92,7 +92,7 @@ bool SceneScriptBB02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(263); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); } return true; } @@ -104,7 +104,7 @@ bool SceneScriptBB02::ClickedOnExit(int exitId) { } Game_Flag_Set(332); Game_Flag_Reset(493); - Set_Enter(1, 5); + Set_Enter(1, kSceneBB04); Scene_Loop_Start_Special(1, 3, false); } return true; @@ -114,7 +114,7 @@ bool SceneScriptBB02::ClickedOnExit(int exitId) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, 179.0f, -415.06f, 274.0f, 0, 0, false, 0); Game_Flag_Set(282); Game_Flag_Reset(493); - Set_Enter(21, 4); + Set_Enter(21, kSceneBB03); } return true; } diff --git a/engines/bladerunner/script/scene/bb03.cpp b/engines/bladerunner/script/scene/bb03.cpp index de538c4523..dccbfe0dab 100644 --- a/engines/bladerunner/script/scene/bb03.cpp +++ b/engines/bladerunner/script/scene/bb03.cpp @@ -89,7 +89,7 @@ bool SceneScriptBB03::ClickedOnExit(int exitId) { Game_Flag_Set(283); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(1, 5); + Set_Enter(1, kSceneBB04); } return true; } @@ -98,7 +98,7 @@ bool SceneScriptBB03::ClickedOnExit(int exitId) { Game_Flag_Set(281); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(1, 3); + Set_Enter(1, kSceneBB02); } return true; } @@ -121,7 +121,7 @@ bool SceneScriptBB03::ClickedOnExit(int exitId) { Game_Flag_Set(285); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(22, 6); + Set_Enter(22, kSceneBB05); } else { Actor_Says(kActorMcCoy, 8522, 3); } diff --git a/engines/bladerunner/script/scene/bb04.cpp b/engines/bladerunner/script/scene/bb04.cpp index 793f786b5c..7f770a50e5 100644 --- a/engines/bladerunner/script/scene/bb04.cpp +++ b/engines/bladerunner/script/scene/bb04.cpp @@ -87,7 +87,7 @@ bool SceneScriptBB04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(333); Game_Flag_Set(493); - Set_Enter(1, 3); + Set_Enter(1, kSceneBB02); } return true; } @@ -96,7 +96,7 @@ bool SceneScriptBB04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(284); - Set_Enter(21, 4); + Set_Enter(21, kSceneBB03); } return true; } diff --git a/engines/bladerunner/script/scene/bb05.cpp b/engines/bladerunner/script/scene/bb05.cpp index a1047ccf50..82957b28a5 100644 --- a/engines/bladerunner/script/scene/bb05.cpp +++ b/engines/bladerunner/script/scene/bb05.cpp @@ -101,7 +101,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(286); - Set_Enter(21, 4); + Set_Enter(21, kSceneBB03); } return true; } @@ -110,7 +110,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(297); - Set_Enter(2, 7); + Set_Enter(2, kSceneBB06); } return true; } @@ -119,7 +119,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(299); - Set_Enter(3, 8); + Set_Enter(3, kSceneBB07); } return true; } @@ -128,7 +128,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(301); - Set_Enter(102, 120); + Set_Enter(102, kSceneBB12); } return true; } diff --git a/engines/bladerunner/script/scene/bb06.cpp b/engines/bladerunner/script/scene/bb06.cpp index 6cdf9076eb..50cdb37f8a 100644 --- a/engines/bladerunner/script/scene/bb06.cpp +++ b/engines/bladerunner/script/scene/bb06.cpp @@ -111,7 +111,7 @@ bool SceneScriptBB06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(298); - Set_Enter(22, 6); + Set_Enter(22, kSceneBB05); } return true; } @@ -120,7 +120,7 @@ bool SceneScriptBB06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(393); - Set_Enter(1, 104); + Set_Enter(1, kSceneBB51); } return true; } @@ -129,7 +129,7 @@ bool SceneScriptBB06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(363); - Set_Enter(2, 8); + Set_Enter(2, kSceneBB07); } return true; } diff --git a/engines/bladerunner/script/scene/bb07.cpp b/engines/bladerunner/script/scene/bb07.cpp index b53db970eb..351448fa6c 100644 --- a/engines/bladerunner/script/scene/bb07.cpp +++ b/engines/bladerunner/script/scene/bb07.cpp @@ -111,7 +111,7 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Overlay_Remove("BB07OVER"); Game_Flag_Set(300); - Set_Enter(22, 6); + Set_Enter(22, kSceneBB05); } return true; } @@ -121,7 +121,7 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Overlay_Remove("BB07OVER"); Game_Flag_Set(364); - Set_Enter(102, 120); + Set_Enter(102, kSceneBB12); } return true; } @@ -131,7 +131,7 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Overlay_Remove("BB07OVER"); Game_Flag_Set(362); - Set_Enter(2, 7); + Set_Enter(2, kSceneBB06); } return true; } diff --git a/engines/bladerunner/script/scene/bb08.cpp b/engines/bladerunner/script/scene/bb08.cpp index 6f8eab33c3..298f53a9bc 100644 --- a/engines/bladerunner/script/scene/bb08.cpp +++ b/engines/bladerunner/script/scene/bb08.cpp @@ -88,7 +88,7 @@ bool SceneScriptBB08::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(218); - Set_Enter(24, 10); + Set_Enter(24, kSceneBB09); } return true; } @@ -97,7 +97,7 @@ bool SceneScriptBB08::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(506); - Set_Enter(102, 120); + Set_Enter(102, kSceneBB12); } return true; } diff --git a/engines/bladerunner/script/scene/bb09.cpp b/engines/bladerunner/script/scene/bb09.cpp index 886b3738e5..bcea82f29b 100644 --- a/engines/bladerunner/script/scene/bb09.cpp +++ b/engines/bladerunner/script/scene/bb09.cpp @@ -86,7 +86,7 @@ bool SceneScriptBB09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(216); Game_Flag_Set(220); - Set_Enter(25, 11); + Set_Enter(25, kSceneBB10); } return true; } @@ -95,7 +95,7 @@ bool SceneScriptBB09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(219); - Set_Enter(23, 9); + Set_Enter(23, kSceneBB08); } return true; } diff --git a/engines/bladerunner/script/scene/bb10.cpp b/engines/bladerunner/script/scene/bb10.cpp index 281f141689..aec9161c4b 100644 --- a/engines/bladerunner/script/scene/bb10.cpp +++ b/engines/bladerunner/script/scene/bb10.cpp @@ -111,7 +111,7 @@ bool SceneScriptBB10::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(222); - Set_Enter(26, 12); + Set_Enter(26, kSceneBB11); } return true; } @@ -121,7 +121,7 @@ bool SceneScriptBB10::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Reset(216); Game_Flag_Set(221); - Set_Enter(24, 10); + Set_Enter(24, kSceneBB09); } return true; } diff --git a/engines/bladerunner/script/scene/bb11.cpp b/engines/bladerunner/script/scene/bb11.cpp index 0216c7b015..3e9aec34b4 100644 --- a/engines/bladerunner/script/scene/bb11.cpp +++ b/engines/bladerunner/script/scene/bb11.cpp @@ -87,7 +87,7 @@ bool SceneScriptBB11::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(223); - Set_Enter(25, 11); + Set_Enter(25, kSceneBB10); } return true; } diff --git a/engines/bladerunner/script/scene/bb12.cpp b/engines/bladerunner/script/scene/bb12.cpp index 289bd3fe4c..8d49377875 100644 --- a/engines/bladerunner/script/scene/bb12.cpp +++ b/engines/bladerunner/script/scene/bb12.cpp @@ -84,7 +84,7 @@ bool SceneScriptBB12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(507); - Set_Enter(23, 9); + Set_Enter(23, kSceneBB08); } return true; } @@ -93,7 +93,7 @@ bool SceneScriptBB12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(365); - Set_Enter(3, 8); + Set_Enter(3, kSceneBB07); } return true; } @@ -102,7 +102,7 @@ bool SceneScriptBB12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(302); - Set_Enter(22, 6); + Set_Enter(22, kSceneBB05); } return true; } diff --git a/engines/bladerunner/script/scene/bb51.cpp b/engines/bladerunner/script/scene/bb51.cpp index ac9f13db47..45eeab4774 100644 --- a/engines/bladerunner/script/scene/bb51.cpp +++ b/engines/bladerunner/script/scene/bb51.cpp @@ -85,7 +85,7 @@ bool SceneScriptBB51::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(394); - Set_Enter(1, 7); + Set_Enter(1, kSceneBB06); } return true; } @@ -94,7 +94,7 @@ bool SceneScriptBB51::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(395); - Set_Enter(1, 7); + Set_Enter(1, kSceneBB06); } return true; } diff --git a/engines/bladerunner/script/scene/ct01.cpp b/engines/bladerunner/script/scene/ct01.cpp index 6a4d1e4c87..0fe5bf9831 100644 --- a/engines/bladerunner/script/scene/ct01.cpp +++ b/engines/bladerunner/script/scene/ct01.cpp @@ -206,14 +206,14 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 106, 0, 0, false); Player_Gains_Control(); Game_Flag_Reset(247); - Set_Enter(27, 14); + Set_Enter(27, kSceneCT02); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -259.0f, -6.5f, 710.0f, 0, 1, false, 0)) { Game_Flag_Reset(247); - Set_Enter(5, 15); + Set_Enter(5, kSceneCT03); } return true; } @@ -221,7 +221,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -419.0f, -6.5f, 696.0f, 0, 1, false, 0)) { Game_Flag_Set(123); Game_Flag_Reset(247); - Set_Enter(4, 24); + Set_Enter(4, kSceneCT12); } return true; } @@ -245,7 +245,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 5, 1); break; case 1: @@ -253,7 +253,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 5, 1); break; case 2: @@ -261,7 +261,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 5, 1); break; case 4: @@ -269,7 +269,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 5, 1); break; case 5: @@ -277,7 +277,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(248); Game_Flag_Reset(247); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 5, 1); break; case 6: @@ -285,7 +285,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 5, 1); break; case 7: @@ -293,7 +293,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 5, 1); break; case 8: @@ -301,7 +301,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 5, 1); break; case 9: @@ -309,7 +309,7 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) { Game_Flag_Reset(247); Game_Flag_Reset(248); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 5, 1); break; default: @@ -406,7 +406,7 @@ void SceneScriptCT01::PlayerWalkedOut() { if (!Game_Flag_Query(176) && Global_Variable_Query(1)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(38, 1, -1); + Outtake_Play(kOuttakeTowards3, true, -1); } } diff --git a/engines/bladerunner/script/scene/ct02.cpp b/engines/bladerunner/script/scene/ct02.cpp index 47293d5b2a..85c8fcb818 100644 --- a/engines/bladerunner/script/scene/ct02.cpp +++ b/engines/bladerunner/script/scene/ct02.cpp @@ -227,7 +227,7 @@ bool SceneScriptCT02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(234); Game_Flag_Set(68); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); } return true; } @@ -242,7 +242,7 @@ bool SceneScriptCT02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(69); - Set_Enter(5, 15); + Set_Enter(5, kSceneCT03); } return true; } diff --git a/engines/bladerunner/script/scene/ct03.cpp b/engines/bladerunner/script/scene/ct03.cpp index df8f45e323..a43cdace98 100644 --- a/engines/bladerunner/script/scene/ct03.cpp +++ b/engines/bladerunner/script/scene/ct03.cpp @@ -83,14 +83,14 @@ bool SceneScriptCT03::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -745.09f, -619.09f, 293.36f, 0, 1, false, 0)) { Game_Flag_Set(71); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -604.38f, -616.15f, 221.6f, 0, 1, false, 0)) { Game_Flag_Set(70); - Set_Enter(27, 14); + Set_Enter(27, kSceneCT02); } return true; } @@ -98,7 +98,7 @@ bool SceneScriptCT03::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -150.0f, -621.3f, 357.0f, 0, 1, false, 0)) { Game_Flag_Set(72); Async_Actor_Walk_To_XYZ(kActorMcCoy, -67.0f, -621.3f, 477.0f, 0, false); - Set_Enter(5, 16); + Set_Enter(5, kSceneCT04); } return true; } diff --git a/engines/bladerunner/script/scene/ct04.cpp b/engines/bladerunner/script/scene/ct04.cpp index 17faf0a269..598be6c1b2 100644 --- a/engines/bladerunner/script/scene/ct04.cpp +++ b/engines/bladerunner/script/scene/ct04.cpp @@ -195,7 +195,7 @@ bool SceneScriptCT04::ClickedOnExit(int exitId) { Actor_Set_Goal_Number(kActorTransient, 2); } Game_Flag_Set(74); - Set_Enter(28, 17); + Set_Enter(28, kSceneCT05); } return true; } @@ -204,7 +204,7 @@ bool SceneScriptCT04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(73); - Set_Enter(5, 15); + Set_Enter(5, kSceneCT03); } return true; } diff --git a/engines/bladerunner/script/scene/ct05.cpp b/engines/bladerunner/script/scene/ct05.cpp index 992a69dfe2..2522b1d100 100644 --- a/engines/bladerunner/script/scene/ct05.cpp +++ b/engines/bladerunner/script/scene/ct05.cpp @@ -142,7 +142,7 @@ bool SceneScriptCT05::ClickedOnExit(int exitId) { if (Actor_Query_Goal_Number(kActorGaff) == 1) { Overlay_Remove("ct05over"); } - Set_Enter(4, 24); + Set_Enter(4, kSceneCT12); } return true; } @@ -154,7 +154,7 @@ bool SceneScriptCT05::ClickedOnExit(int exitId) { Actor_Set_Goal_Number(kActorGaff, 5); Game_Flag_Set(409); } - Set_Enter(5, 16); + Set_Enter(5, kSceneCT04); } return true; } @@ -170,7 +170,7 @@ bool SceneScriptCT05::ClickedOnExit(int exitId) { if (Actor_Query_Goal_Number(kActorGaff) == 1) { Overlay_Remove("ct05over"); } - Set_Enter(29, 18); + Set_Enter(29, kSceneCT06); } return true; } diff --git a/engines/bladerunner/script/scene/ct06.cpp b/engines/bladerunner/script/scene/ct06.cpp index cebf9d1eef..d04dccf5ed 100644 --- a/engines/bladerunner/script/scene/ct06.cpp +++ b/engines/bladerunner/script/scene/ct06.cpp @@ -121,7 +121,7 @@ bool SceneScriptCT06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(78); - Set_Enter(28, 17); + Set_Enter(28, kSceneCT05); Game_Flag_Reset(212); } return true; @@ -147,7 +147,7 @@ bool SceneScriptCT06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(79); - Set_Enter(6, 20); + Set_Enter(6, kSceneCT08); Game_Flag_Reset(212); } } diff --git a/engines/bladerunner/script/scene/ct08.cpp b/engines/bladerunner/script/scene/ct08.cpp index afbe8deea6..e2e6203a0b 100644 --- a/engines/bladerunner/script/scene/ct08.cpp +++ b/engines/bladerunner/script/scene/ct08.cpp @@ -28,15 +28,15 @@ void SceneScriptCT08::InitializeScene() { if (Game_Flag_Query(679)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(2, 0, -1); + Outtake_Play(kOuttakeMovieB1, false, -1); if (Game_Flag_Query(46)) { - Outtake_Play(3, 0, -1); + Outtake_Play(kOuttakeMovieB2, false, -1); } else if (Game_Flag_Query(47)) { - Outtake_Play(4, 0, -1); + Outtake_Play(kOuttakeMovieB3, false, -1); } else { - Outtake_Play(5, 0, -1); + Outtake_Play(kOuttakeMovieB4, false, -1); } - Outtake_Play(6, 0, -1); + Outtake_Play(kOuttakeMovieB5, false, -1); Game_Flag_Reset(679); } Actor_Force_Stop_Walking(kActorMcCoy); @@ -116,7 +116,7 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(81); - Set_Enter(31, 21); + Set_Enter(31, kSceneCT09); } return true; } @@ -126,7 +126,7 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(379); - Set_Enter(6, 105); + Set_Enter(6, kSceneCT51); } return true; } @@ -135,7 +135,7 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(80); - Set_Enter(29, 18); + Set_Enter(29, kSceneCT06); } return true; } diff --git a/engines/bladerunner/script/scene/ct09.cpp b/engines/bladerunner/script/scene/ct09.cpp index 3c883f4aca..10b0a77f9c 100644 --- a/engines/bladerunner/script/scene/ct09.cpp +++ b/engines/bladerunner/script/scene/ct09.cpp @@ -112,7 +112,7 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(84); - Set_Enter(6, 20); + Set_Enter(6, kSceneCT08); } return true; } @@ -121,7 +121,7 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(83); - Set_Enter(33, 23); + Set_Enter(33, kSceneCT11); } return true; } @@ -130,7 +130,7 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(82); - Set_Enter(32, 22); + Set_Enter(32, kSceneCT10); } return true; } diff --git a/engines/bladerunner/script/scene/ct10.cpp b/engines/bladerunner/script/scene/ct10.cpp index 032f3fb763..186b7678ff 100644 --- a/engines/bladerunner/script/scene/ct10.cpp +++ b/engines/bladerunner/script/scene/ct10.cpp @@ -121,7 +121,7 @@ bool SceneScriptCT10::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(85); - Set_Enter(31, 21); + Set_Enter(31, kSceneCT09); } } return false; diff --git a/engines/bladerunner/script/scene/ct11.cpp b/engines/bladerunner/script/scene/ct11.cpp index 1aad413d60..3942a89b42 100644 --- a/engines/bladerunner/script/scene/ct11.cpp +++ b/engines/bladerunner/script/scene/ct11.cpp @@ -101,7 +101,7 @@ bool SceneScriptCT11::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 121.0f, 9.6800003f, -42.0f, 0, 1, false, 0)) { Game_Flag_Set(304); - Set_Enter(31, 21); + Set_Enter(31, kSceneCT09); } return true; } @@ -109,7 +109,7 @@ bool SceneScriptCT11::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -300.0f, 9.6800003f, 66.0f, 0, 1, false, 0)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -400.0f, 9.6800003f, -70.0f, 0, 1, false, 0); Game_Flag_Set(86); - Set_Enter(4, 24); + Set_Enter(4, kSceneCT12); } return true; } @@ -118,7 +118,7 @@ bool SceneScriptCT11::ClickedOnExit(int exitId) { Game_Flag_Set(531); Game_Flag_Reset(176); Game_Flag_Set(177); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); } return true; } diff --git a/engines/bladerunner/script/scene/ct12.cpp b/engines/bladerunner/script/scene/ct12.cpp index 41ebdec25e..826d0945fe 100644 --- a/engines/bladerunner/script/scene/ct12.cpp +++ b/engines/bladerunner/script/scene/ct12.cpp @@ -141,7 +141,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -419.14999f, -6.5f, 696.94f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Game_Flag_Set(88); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); } return true; } @@ -150,7 +150,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(89); - Set_Enter(5, 15); + Set_Enter(5, kSceneCT03); } return true; } @@ -159,7 +159,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(90); - Set_Enter(28, 17); + Set_Enter(28, kSceneCT05); } return true; } @@ -168,7 +168,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(91); - Set_Enter(33, 23); + Set_Enter(33, kSceneCT11); } return true; } @@ -180,7 +180,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(433); - Set_Enter(82, 94); + Set_Enter(82, kSceneUG09); } return true; } diff --git a/engines/bladerunner/script/scene/ct51.cpp b/engines/bladerunner/script/scene/ct51.cpp index b25a8fd790..73d6d92d7a 100644 --- a/engines/bladerunner/script/scene/ct51.cpp +++ b/engines/bladerunner/script/scene/ct51.cpp @@ -96,7 +96,7 @@ bool SceneScriptCT51::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(380); - Set_Enter(6, 20); + Set_Enter(6, kSceneCT08); } return true; } diff --git a/engines/bladerunner/script/scene/dr01.cpp b/engines/bladerunner/script/scene/dr01.cpp index dd3303ab16..cc6eb640ae 100644 --- a/engines/bladerunner/script/scene/dr01.cpp +++ b/engines/bladerunner/script/scene/dr01.cpp @@ -110,7 +110,7 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -911.0f, -0.04f, -118.0f, 0, false); Ambient_Sounds_Adjust_Looping_Sound(112, 10, -100, 1); Game_Flag_Set(224); - Set_Enter(7, 26); + Set_Enter(7, kSceneDR02); } return true; } @@ -118,7 +118,7 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -711.0f, -0.04f, 70.0f, 0, 1, false, 0)) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -796.0f, -0.04f, 166.0f, 0, false); Game_Flag_Set(10); - Set_Enter(7, 28); + Set_Enter(7, kSceneDR04); } return true; } @@ -138,55 +138,55 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) { Game_Flag_Set(182); Game_Flag_Reset(253); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); break; case 3: Game_Flag_Set(176); Game_Flag_Reset(253); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); break; case 1: Game_Flag_Set(179); Game_Flag_Reset(253); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); break; case 0: Game_Flag_Set(178); Game_Flag_Reset(253); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); break; case 5: Game_Flag_Set(261); Game_Flag_Reset(253); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); break; case 4: Game_Flag_Set(180); Game_Flag_Reset(253); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); break; case 7: Game_Flag_Set(258); Game_Flag_Reset(253); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); break; case 8: Game_Flag_Set(181); Game_Flag_Reset(253); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); break; case 9: Game_Flag_Set(257); Game_Flag_Reset(253); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); break; default: Player_Loses_Control(); @@ -210,7 +210,7 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) { Game_Flag_Set(558); Game_Flag_Set(176); Game_Flag_Reset(177); - Set_Enter(33, 23); + Set_Enter(33, kSceneCT11); } return true; } @@ -252,7 +252,7 @@ void SceneScriptDR01::PlayerWalkedOut() { if (!Game_Flag_Query(10) && !Game_Flag_Query(224) && !Game_Flag_Query(558)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(35, 1, -1); + Outtake_Play(kOuttakeInside2, true, -1); } } diff --git a/engines/bladerunner/script/scene/dr02.cpp b/engines/bladerunner/script/scene/dr02.cpp index 874a829473..78987dcdc9 100644 --- a/engines/bladerunner/script/scene/dr02.cpp +++ b/engines/bladerunner/script/scene/dr02.cpp @@ -120,7 +120,7 @@ bool SceneScriptDR02::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -835.0f, -0.04f, -118.0f, 0, 1, false, 0)) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -727.0f, -0.04f, -118.0f, 0, false); Game_Flag_Set(225); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); } Ambient_Sounds_Adjust_Looping_Sound(219, 12, -101, 1); Ambient_Sounds_Adjust_Looping_Sound(98, 14, -101, 1); @@ -132,7 +132,7 @@ bool SceneScriptDR02::ClickedOnExit(int exitId) { Actor_Says(kActorMcCoy, 8522, 15); } else { Game_Flag_Set(226); - Set_Enter(34, 27); + Set_Enter(34, kSceneDR03); } } return true; @@ -142,7 +142,7 @@ bool SceneScriptDR02::ClickedOnExit(int exitId) { Game_Flag_Set(265); Game_Flag_Reset(177); Game_Flag_Set(258); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); } return true; } diff --git a/engines/bladerunner/script/scene/dr03.cpp b/engines/bladerunner/script/scene/dr03.cpp index 3fe1a91f64..077eb39eea 100644 --- a/engines/bladerunner/script/scene/dr03.cpp +++ b/engines/bladerunner/script/scene/dr03.cpp @@ -128,7 +128,7 @@ bool SceneScriptDR03::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 330.31f, 4.27f, -910.91f, 24, 1, false, 0)) { Game_Flag_Set(227); - Set_Enter(7, 26); + Set_Enter(7, kSceneDR02); } return true; } diff --git a/engines/bladerunner/script/scene/dr04.cpp b/engines/bladerunner/script/scene/dr04.cpp index b0e6e3bcb7..fe8032997a 100644 --- a/engines/bladerunner/script/scene/dr04.cpp +++ b/engines/bladerunner/script/scene/dr04.cpp @@ -138,7 +138,7 @@ bool SceneScriptDR04::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -761.0f, -0.04f, 97.0f, 0, 1, false, 0)) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -683.0f, -0.04f, 43.0f, 0, false); Game_Flag_Set(11); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); } return true; } @@ -146,7 +146,7 @@ bool SceneScriptDR04::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1067.0f, 7.18f, 421.0f, 0, 1, false, 0)) { Game_Flag_Set(232); Game_Flag_Set(228); - Set_Enter(35, 29); + Set_Enter(35, kSceneDR05); } return true; } @@ -162,7 +162,7 @@ bool SceneScriptDR04::ClickedOnExit(int exitId) { Actor_Set_Immunity_To_Obstacles(kActorMcCoy, false); Footstep_Sound_Override_Off(); Game_Flag_Set(230); - Set_Enter(36, 30); + Set_Enter(36, kSceneDR06); } return true; } diff --git a/engines/bladerunner/script/scene/dr05.cpp b/engines/bladerunner/script/scene/dr05.cpp index a1c831199b..0793d8bbcc 100644 --- a/engines/bladerunner/script/scene/dr05.cpp +++ b/engines/bladerunner/script/scene/dr05.cpp @@ -108,7 +108,7 @@ bool SceneScriptDR05::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -22.0f, 0.3f, 221.0f, 0, 1, false, 0)) { Game_Flag_Reset(232); Game_Flag_Set(229); - Set_Enter(7, 28); + Set_Enter(7, kSceneDR04); } return true; } diff --git a/engines/bladerunner/script/scene/dr06.cpp b/engines/bladerunner/script/scene/dr06.cpp index e17a436e33..6f3947c6fb 100644 --- a/engines/bladerunner/script/scene/dr06.cpp +++ b/engines/bladerunner/script/scene/dr06.cpp @@ -180,14 +180,14 @@ bool SceneScriptDR06::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -733.0f, 136.6f, -980.0f, 0, 1, false, 0)) { Game_Flag_Set(231); - Set_Enter(7, 28); + Set_Enter(7, kSceneDR04); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -707.57f, 136.6f, -1132.64f, 0, 1, false, 0)) { Game_Flag_Set(552); - Set_Enter(19, 100); + Set_Enter(19, kSceneUG16); } return true; } diff --git a/engines/bladerunner/script/scene/hc01.cpp b/engines/bladerunner/script/scene/hc01.cpp index 1505339e68..2169986b9e 100644 --- a/engines/bladerunner/script/scene/hc01.cpp +++ b/engines/bladerunner/script/scene/hc01.cpp @@ -146,7 +146,7 @@ bool SceneScriptHC01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 814.0f, 0.14f, 153.0f, 0, 1, false, 0)) { Music_Adjust(12, 0, 2); Game_Flag_Set(323); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Game_Flag_Reset(479); Game_Flag_Set(180); } @@ -155,7 +155,7 @@ bool SceneScriptHC01::ClickedOnExit(int exitId) { if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 607.0f, 0.14f, 9.0f, 0, 1, false, 0)) { Game_Flag_Set(386); - Set_Enter(8, 33); + Set_Enter(8, kSceneHC03); } return true; } @@ -163,7 +163,7 @@ bool SceneScriptHC01::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 105.0f, 0.14f, 103.0f, 0, 1, false, 0)) { Game_Flag_Set(384); Async_Actor_Walk_To_XYZ(kActorMcCoy, -57.0f, 0.14f, 83.0f, 0, false); - Set_Enter(8, 32); + Set_Enter(8, kSceneHC02); } return true; } diff --git a/engines/bladerunner/script/scene/hc02.cpp b/engines/bladerunner/script/scene/hc02.cpp index a7fe69440b..746a0f487c 100644 --- a/engines/bladerunner/script/scene/hc02.cpp +++ b/engines/bladerunner/script/scene/hc02.cpp @@ -164,7 +164,7 @@ bool SceneScriptHC02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(385); - Set_Enter(8, 31); + Set_Enter(8, kSceneHC01); } return true; } @@ -174,7 +174,7 @@ bool SceneScriptHC02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(110); Async_Actor_Walk_To_XYZ(kActorMcCoy, -88.0f, 0.14f, -463.0f, 0, false); - Set_Enter(8, 106); + Set_Enter(8, kSceneHC04); } return true; } diff --git a/engines/bladerunner/script/scene/hc03.cpp b/engines/bladerunner/script/scene/hc03.cpp index 02e88bb3fa..93fea0ac9a 100644 --- a/engines/bladerunner/script/scene/hc03.cpp +++ b/engines/bladerunner/script/scene/hc03.cpp @@ -131,7 +131,7 @@ bool SceneScriptHC03::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 607.0f, 0.14f, 9.0f, 0, 1, false, 0)) { Game_Flag_Set(387); - Set_Enter(8, 31); + Set_Enter(8, kSceneHC01); } return true; } @@ -143,7 +143,7 @@ bool SceneScriptHC03::ClickedOnExit(int exitId) { Game_Flag_Set(259); Game_Flag_Set(388); Music_Stop(2); - Set_Enter(75, 87); + Set_Enter(75, kSceneUG02); } else { Scene_Loop_Set_Default(6); Scene_Loop_Start_Special(kSceneLoopMode2, 5, true); diff --git a/engines/bladerunner/script/scene/hc04.cpp b/engines/bladerunner/script/scene/hc04.cpp index 126d5c3c4f..d83dfc4cf0 100644 --- a/engines/bladerunner/script/scene/hc04.cpp +++ b/engines/bladerunner/script/scene/hc04.cpp @@ -113,14 +113,14 @@ bool SceneScriptHC04::ClickedOnExit(int exitId) { Game_Flag_Set(107); Game_Flag_Reset(479); Game_Flag_Set(182); - Set_Enter(70, 80); + Set_Enter(70, kSceneRC03); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -72.0f, 0.14f, -399.0f, 0, 1, false, 0)) { Game_Flag_Set(109); - Set_Enter(8, 32); + Set_Enter(8, kSceneHC02); } return true; } 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) { diff --git a/engines/bladerunner/script/scene/hf02.cpp b/engines/bladerunner/script/scene/hf02.cpp index ffa32a8ca4..258b942f3f 100644 --- a/engines/bladerunner/script/scene/hf02.cpp +++ b/engines/bladerunner/script/scene/hf02.cpp @@ -88,7 +88,7 @@ bool SceneScriptHF02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(309); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); } return true; } @@ -97,7 +97,7 @@ bool SceneScriptHF02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(527); - Set_Enter(39, 36); + Set_Enter(39, kSceneHF03); } return true; } diff --git a/engines/bladerunner/script/scene/hf03.cpp b/engines/bladerunner/script/scene/hf03.cpp index f957a29daa..1117f222da 100644 --- a/engines/bladerunner/script/scene/hf03.cpp +++ b/engines/bladerunner/script/scene/hf03.cpp @@ -190,21 +190,21 @@ bool SceneScriptHF03::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 179.0f, 46.76f, -824.0f, 0, 1, false, 0)) { Game_Flag_Set(311); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 479.0f, 47.76f, -524.0f, 0, 1, false, 0)) { Game_Flag_Set(528); - Set_Enter(38, 35); + Set_Enter(38, kSceneHF02); } return true; } if (exitId == 2) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 942.0f, 47.76f, -847.0f, 0, 1, false, 0)) { Game_Flag_Set(566); - Set_Enter(40, 37); + Set_Enter(40, kSceneHF04); } return true; } diff --git a/engines/bladerunner/script/scene/hf04.cpp b/engines/bladerunner/script/scene/hf04.cpp index aaa3e8f25e..f96053a773 100644 --- a/engines/bladerunner/script/scene/hf04.cpp +++ b/engines/bladerunner/script/scene/hf04.cpp @@ -84,7 +84,7 @@ bool SceneScriptHF04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(567); - Set_Enter(38, 35); + Set_Enter(38, kSceneHF02); } return true; } diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp index 8106f71242..ea1fe7f28d 100644 --- a/engines/bladerunner/script/scene/hf05.cpp +++ b/engines/bladerunner/script/scene/hf05.cpp @@ -146,7 +146,7 @@ bool SceneScriptHF05::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 483.0f, 40.63f, -189.0f, 0, 1, false, 0) && !Game_Flag_Query(684)) { Game_Flag_Set(313); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); } return true; } @@ -158,14 +158,14 @@ bool SceneScriptHF05::ClickedOnExit(int exitId) { Actor_Says(kActorMcCoy, 1810, 16); } Game_Flag_Set(359); - Set_Enter(43, 40); + Set_Enter(43, kSceneHF07); } return true; } if (exitId == 2) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 277.0f, 40.631f, 410.0f, 0, 1, false, 0) && !Game_Flag_Query(684)) { Game_Flag_Set(529); - Set_Enter(42, 39); + Set_Enter(42, kSceneHF06); } return true; } @@ -469,10 +469,10 @@ void SceneScriptHF05::sub_403738() { Actor_Set_Goal_Number(kActorCrazylegs, 699); Game_Flag_Set(652); if (Game_Flag_Query(255)) { - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); } else { Game_Flag_Set(313); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); } } else if (answer == 1260) { Actor_Says(kActorMcCoy, 1965, 12); @@ -588,7 +588,7 @@ void SceneScriptHF05::sub_403A34(int actorId) { Async_Actor_Walk_To_XYZ(actorId, 309.0f, 40.63f, 402.0f, 0, false); Loop_Actor_Walk_To_XYZ(kActorMcCoy, 277.0f, 40.63f, 410.0f, 0, 0, false, 0); Game_Flag_Set(529); - Set_Enter(42, 39); + Set_Enter(42, kSceneHF06); } } diff --git a/engines/bladerunner/script/scene/hf06.cpp b/engines/bladerunner/script/scene/hf06.cpp index cd5651af0f..406e4e5a92 100644 --- a/engines/bladerunner/script/scene/hf06.cpp +++ b/engines/bladerunner/script/scene/hf06.cpp @@ -126,7 +126,7 @@ bool SceneScriptHF06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(530); - Set_Enter(41, 38); + Set_Enter(41, kSceneHF05); } return true; } diff --git a/engines/bladerunner/script/scene/hf07.cpp b/engines/bladerunner/script/scene/hf07.cpp index 1669afb104..bdd748fdf0 100644 --- a/engines/bladerunner/script/scene/hf07.cpp +++ b/engines/bladerunner/script/scene/hf07.cpp @@ -83,7 +83,7 @@ bool SceneScriptHF07::ClickedOnExit(int exitId) { } Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(41, 38); + Set_Enter(41, kSceneHF05); } return true; } @@ -97,7 +97,7 @@ bool SceneScriptHF07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(360); - Set_Enter(78, 90); + Set_Enter(78, kSceneUG05); } return true; } diff --git a/engines/bladerunner/script/scene/kp01.cpp b/engines/bladerunner/script/scene/kp01.cpp index e70a8d5375..af6f57f759 100644 --- a/engines/bladerunner/script/scene/kp01.cpp +++ b/engines/bladerunner/script/scene/kp01.cpp @@ -83,7 +83,7 @@ bool SceneScriptKP01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(415); - Set_Enter(47, 44); + Set_Enter(47, kSceneKP04); } return true; } @@ -92,7 +92,7 @@ bool SceneScriptKP01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(417); - Set_Enter(46, 43); + Set_Enter(46, kSceneKP03); } return true; } @@ -101,7 +101,7 @@ bool SceneScriptKP01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(414); - Set_Enter(45, 42); + Set_Enter(45, kSceneKP02); } return true; } @@ -136,7 +136,7 @@ void SceneScriptKP01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(417); - Set_Enter(46, 43); + Set_Enter(46, kSceneKP03); //return true; } } diff --git a/engines/bladerunner/script/scene/kp02.cpp b/engines/bladerunner/script/scene/kp02.cpp index e4e47da83a..1e83d1e310 100644 --- a/engines/bladerunner/script/scene/kp02.cpp +++ b/engines/bladerunner/script/scene/kp02.cpp @@ -84,12 +84,12 @@ bool SceneScriptKP02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(411); - Set_Enter(84, 96); + Set_Enter(84, kSceneUG12); } else { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(411); - Set_Enter(84, 96); + Set_Enter(84, kSceneUG12); } } return true; @@ -104,12 +104,12 @@ bool SceneScriptKP02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(413); - Set_Enter(44, 41); + Set_Enter(44, kSceneKP01); } else { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(413); - Set_Enter(44, 41); + Set_Enter(44, kSceneKP01); } } return true; diff --git a/engines/bladerunner/script/scene/kp03.cpp b/engines/bladerunner/script/scene/kp03.cpp index 4071fd6a15..27f1ee2583 100644 --- a/engines/bladerunner/script/scene/kp03.cpp +++ b/engines/bladerunner/script/scene/kp03.cpp @@ -127,7 +127,7 @@ bool SceneScriptKP03::ClickedOnExit(int exitId) { Game_Flag_Reset(417); Game_Flag_Reset(420); Game_Flag_Set(419); - Set_Enter(9, 45); + Set_Enter(9, kSceneKP05); } return true; } @@ -139,7 +139,7 @@ bool SceneScriptKP03::ClickedOnExit(int exitId) { Game_Flag_Reset(417); Game_Flag_Reset(420); Game_Flag_Set(418); - Set_Enter(44, 41); + Set_Enter(44, kSceneKP01); } return true; } @@ -255,7 +255,7 @@ void SceneScriptKP03::sub_401E54() { Game_Flag_Reset(417); Game_Flag_Reset(420); Game_Flag_Set(419); - Set_Enter(9, 45); + Set_Enter(9, kSceneKP05); Player_Gains_Control(); } diff --git a/engines/bladerunner/script/scene/kp04.cpp b/engines/bladerunner/script/scene/kp04.cpp index 5da5050dd3..daa95f866a 100644 --- a/engines/bladerunner/script/scene/kp04.cpp +++ b/engines/bladerunner/script/scene/kp04.cpp @@ -74,7 +74,7 @@ bool SceneScriptKP04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(416); - Set_Enter(44, 41); + Set_Enter(44, kSceneKP01); } return true; } @@ -83,7 +83,7 @@ bool SceneScriptKP04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(574); - Set_Enter(9, 45); + Set_Enter(9, kSceneKP05); } return true; } diff --git a/engines/bladerunner/script/scene/kp05.cpp b/engines/bladerunner/script/scene/kp05.cpp index d957c70693..11a246b301 100644 --- a/engines/bladerunner/script/scene/kp05.cpp +++ b/engines/bladerunner/script/scene/kp05.cpp @@ -88,7 +88,7 @@ bool SceneScriptKP05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(420); - Set_Enter(46, 43); + Set_Enter(46, kSceneKP03); } return true; } @@ -97,7 +97,7 @@ bool SceneScriptKP05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(575); - Set_Enter(47, 44); + Set_Enter(47, kSceneKP04); } return true; } @@ -107,7 +107,7 @@ bool SceneScriptKP05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(576); Async_Actor_Walk_To_XYZ(kActorMcCoy, -868.0f, 0.0f, -216.0f, 0, false); - Set_Enter(9, 46); + Set_Enter(9, kSceneKP06); } return true; } diff --git a/engines/bladerunner/script/scene/kp06.cpp b/engines/bladerunner/script/scene/kp06.cpp index e9fab6dae9..e237bfaf5d 100644 --- a/engines/bladerunner/script/scene/kp06.cpp +++ b/engines/bladerunner/script/scene/kp06.cpp @@ -101,7 +101,7 @@ bool SceneScriptKP06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(577); - Set_Enter(9, 45); + Set_Enter(9, kSceneKP05); } return true; } @@ -120,7 +120,7 @@ bool SceneScriptKP06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(578); - Set_Enter(48, 47); + Set_Enter(48, kSceneKP07); } } else if (Actor_Clue_Query(kActorMcCoy, kCluePowerSource) ) { Actor_Says(kActorSadik, 280, 3); @@ -131,7 +131,7 @@ bool SceneScriptKP06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(578); - Set_Enter(48, 47); + Set_Enter(48, kSceneKP07); } else { Actor_Set_Goal_Number(kActorSadik, 417); } @@ -175,7 +175,7 @@ void SceneScriptKP06::PlayerWalkedIn() { Delay(3000); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(25, 0, -1); + Outtake_Play(kOuttakeEnd6, false, -1); Game_Over(); //return true; return; @@ -206,7 +206,7 @@ void SceneScriptKP06::PlayerWalkedIn() { Async_Actor_Walk_To_Waypoint(kActorGaff, 551, 0, 0); Actor_Says(kActorGaff, 310, -1); Delay(3000); - Outtake_Play(26, 0, -1); + Outtake_Play(kOuttakeEnd7, false, -1); Game_Over(); //return true; return; diff --git a/engines/bladerunner/script/scene/kp07.cpp b/engines/bladerunner/script/scene/kp07.cpp index 9ebb9967df..0b6558ef81 100644 --- a/engines/bladerunner/script/scene/kp07.cpp +++ b/engines/bladerunner/script/scene/kp07.cpp @@ -122,7 +122,7 @@ bool SceneScriptKP07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(579); - Set_Enter(9, 46); + Set_Enter(9, kSceneKP06); } return true; } diff --git a/engines/bladerunner/script/scene/ma01.cpp b/engines/bladerunner/script/scene/ma01.cpp index f4963143e5..289f5b0203 100644 --- a/engines/bladerunner/script/scene/ma01.cpp +++ b/engines/bladerunner/script/scene/ma01.cpp @@ -98,7 +98,7 @@ bool SceneScriptMA01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagMA01toMA06); - Set_Enter(52, 52); + Set_Enter(52, kSceneMA06); } return true; } @@ -121,63 +121,63 @@ bool SceneScriptMA01::ClickedOnExit(int exitId) { Game_Flag_Set(178); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationRuncitersAnimals: Game_Flag_Set(182); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationChinatown: Game_Flag_Set(176); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationTyrellBuilding: Game_Flag_Set(261); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationAnimoidRow: Game_Flag_Set(180); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationDNARow: Game_Flag_Set(177); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationBradburyBuilding: Game_Flag_Set(258); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationNightclubRow: Game_Flag_Set(181); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; case kSpinnerDestinationHysteriaHall: Game_Flag_Set(257); Game_Flag_Reset(kFlagMA01Locked); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 4, true); break; default: @@ -245,9 +245,9 @@ void SceneScriptMA01::PlayerWalkedOut() { if (!Game_Flag_Query(37) && Global_Variable_Query(1) == 1) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(37, 1, -1); - Outtake_Play(34, 1, -1); - Outtake_Play(36, 1, -1); + Outtake_Play(kOuttakeTowards2, true, -1); + Outtake_Play(kOuttakeInside1, true, -1); + Outtake_Play(kOuttakeTowards1, true, -1); } } diff --git a/engines/bladerunner/script/scene/ma02.cpp b/engines/bladerunner/script/scene/ma02.cpp index 62b5d68cf9..0bdb0d2f2c 100644 --- a/engines/bladerunner/script/scene/ma02.cpp +++ b/engines/bladerunner/script/scene/ma02.cpp @@ -120,14 +120,14 @@ bool SceneScriptMA02::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.19f, -144.12f, 378.27f, 0, 1, false, 0)) { Music_Stop(10); Game_Flag_Set(kFlagMA02toMA06); - Set_Enter(52, 52); + Set_Enter(52, kSceneMA06); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -168.0f, -144.13f, 10.27f, 0, 1, false, 0)) { Game_Flag_Set(kFlagMA02ToMA04); - Set_Enter(50, 50); + Set_Enter(50, kSceneMA04); } return true; } @@ -157,7 +157,7 @@ void SceneScriptMA02::PlayerWalkedIn() { sub_401E4C(); Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.19f, -144.12f, 378.27f, 0, 0, false, 0); Game_Flag_Set(kFlagMA02toMA06); - Set_Enter(52, 52); + Set_Enter(52, kSceneMA06); // return true; return; } diff --git a/engines/bladerunner/script/scene/ma04.cpp b/engines/bladerunner/script/scene/ma04.cpp index 4b2e65ef98..13ca308227 100644 --- a/engines/bladerunner/script/scene/ma04.cpp +++ b/engines/bladerunner/script/scene/ma04.cpp @@ -109,7 +109,7 @@ bool SceneScriptMA04::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7099.0f, 954.0f, 1866.0f, 0, 1, false, 0)) { Game_Flag_Set(kFlagMA04ToMA02); - Set_Enter(10, 49); + Set_Enter(10, kSceneMA02); } return true; } @@ -125,7 +125,7 @@ bool SceneScriptMA04::ClickedOnExit(int exitId) { if (Global_Variable_Query(1) != 2 && Global_Variable_Query(1) != 3) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 956.17f, 1568.0f, 0, false); } - Set_Enter(51, 51); + Set_Enter(51, kSceneMA05); } return true; } @@ -290,7 +290,7 @@ void SceneScriptMA04::PlayerWalkedIn() { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 955.0f, 1675.0f, 0, 1, false, 0); Game_Flag_Set(146); Async_Actor_Walk_To_XYZ(kActorMcCoy, -7204.0f, 956.17f, 1568.0f, 0, false); - Set_Enter(51, 51); + Set_Enter(51, kSceneMA05); } } @@ -300,7 +300,7 @@ void SceneScriptMA04::PlayerWalkedOut() { if (Game_Flag_Query(678)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(1, 0, -1); + Outtake_Play(kOuttakeMovieA, false, -1); Game_Flag_Reset(678); } } @@ -556,7 +556,7 @@ void SceneScriptMA04::sleep() { } } } else { - Set_Enter(10, 50); + Set_Enter(10, kSceneMA04); } Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 3, false); } diff --git a/engines/bladerunner/script/scene/ma05.cpp b/engines/bladerunner/script/scene/ma05.cpp index a1f3288b0e..a086a25c87 100644 --- a/engines/bladerunner/script/scene/ma05.cpp +++ b/engines/bladerunner/script/scene/ma05.cpp @@ -82,7 +82,7 @@ bool SceneScriptMA05::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Async_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 953.97f, 1685.0f, 0, false); - Set_Enter(50, 50); + Set_Enter(50, kSceneMA04); } return true; } diff --git a/engines/bladerunner/script/scene/ma06.cpp b/engines/bladerunner/script/scene/ma06.cpp index e545e291b3..df325fece7 100644 --- a/engines/bladerunner/script/scene/ma06.cpp +++ b/engines/bladerunner/script/scene/ma06.cpp @@ -83,11 +83,11 @@ void SceneScriptMA06::PlayerWalkedIn() { Game_Flag_Reset(kFlagMA07toMA06); if (Game_Flag_Query(kFlagMA06toMA01)) { - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); } else if (Game_Flag_Query(kFlagMA06ToMA02)) { - Set_Enter(10, 49); + Set_Enter(10, kSceneMA02); } else { // kFlagMA06ToMA07 - Set_Enter(53, 53); + Set_Enter(53, kSceneMA07); } Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 3, true); Sound_Play(208, 100, 50, 50, 50); diff --git a/engines/bladerunner/script/scene/ma07.cpp b/engines/bladerunner/script/scene/ma07.cpp index aa87a37721..bdba1a0371 100644 --- a/engines/bladerunner/script/scene/ma07.cpp +++ b/engines/bladerunner/script/scene/ma07.cpp @@ -79,7 +79,7 @@ bool SceneScriptMA07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagMA07toMA06); - Set_Enter(52, 52); + Set_Enter(52, kSceneMA06); } } return true; @@ -91,7 +91,7 @@ bool SceneScriptMA07::ClickedOnExit(int exitId) { Game_Flag_Set(672); Game_Flag_Reset(179); Game_Flag_Set(178); - Set_Enter(68, 77); + Set_Enter(68, kScenePS14); } return true; } @@ -100,7 +100,7 @@ bool SceneScriptMA07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(357); - Set_Enter(90, 103); + Set_Enter(90, kSceneUG19); } return true; } @@ -144,7 +144,7 @@ void SceneScriptMA07::PlayerWalkedIn() { Delay(1000); Game_Flag_Reset(666); Game_Flag_Set(kFlagMA06ToMA02); - Set_Enter(10, 49); + Set_Enter(10, kSceneMA02); } //return false; diff --git a/engines/bladerunner/script/scene/nr01.cpp b/engines/bladerunner/script/scene/nr01.cpp index 3a5ef197d6..da71325115 100644 --- a/engines/bladerunner/script/scene/nr01.cpp +++ b/engines/bladerunner/script/scene/nr01.cpp @@ -116,7 +116,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(535); - Set_Enter(55, 56); + Set_Enter(55, kSceneNR03); } } return true; @@ -128,7 +128,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(343); - Set_Enter(79, 91); + Set_Enter(79, kSceneUG06); } return true; } @@ -137,7 +137,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(532); - Set_Enter(11, 55); + Set_Enter(11, kSceneNR02); } return true; } @@ -156,7 +156,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Set(257); Game_Flag_Reset(255); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 3, 1); break; case 7: @@ -164,7 +164,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 3, 1); break; case 6: @@ -172,7 +172,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 3, 1); break; case 5: @@ -180,7 +180,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); Scene_Loop_Start_Special(1, 3, 1); break; case 4: @@ -188,7 +188,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 3, 1); break; case 3: @@ -196,7 +196,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); Scene_Loop_Start_Special(1, 3, 1); break; case 2: @@ -204,7 +204,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 3, 1); break; case 1: @@ -212,7 +212,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 3, 1); break; case 0: @@ -220,7 +220,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) { Game_Flag_Reset(255); Game_Flag_Reset(247); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 3, 1); break; default: @@ -303,7 +303,7 @@ void SceneScriptNR01::PlayerWalkedIn() { } if (Game_Flag_Query(632)) { Delay(3500); - Set_Enter(60, 64); + Set_Enter(60, kSceneNR11); //return true; return; } @@ -421,8 +421,8 @@ void SceneScriptNR01::PlayerWalkedOut() { if (!Game_Flag_Query(343) && !Game_Flag_Query(532) && !Game_Flag_Query(535) && !Game_Flag_Query(632) && !Game_Flag_Query(722)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(30, 1, -1); - Outtake_Play(35, 1, -1); + Outtake_Play(kOuttakeAway1, true, -1); + Outtake_Play(kOuttakeInside2, true, -1); } Game_Flag_Reset(722); } diff --git a/engines/bladerunner/script/scene/nr02.cpp b/engines/bladerunner/script/scene/nr02.cpp index a6ccb5c40b..adb15ffce8 100644 --- a/engines/bladerunner/script/scene/nr02.cpp +++ b/engines/bladerunner/script/scene/nr02.cpp @@ -129,7 +129,7 @@ bool SceneScriptNR02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(533); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); } return true; } diff --git a/engines/bladerunner/script/scene/nr03.cpp b/engines/bladerunner/script/scene/nr03.cpp index 0ceb8e548e..dfeacb16f4 100644 --- a/engines/bladerunner/script/scene/nr03.cpp +++ b/engines/bladerunner/script/scene/nr03.cpp @@ -131,7 +131,7 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(534); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); } return true; } @@ -157,7 +157,7 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(438); - Set_Enter(12, 57); + Set_Enter(12, kSceneNR04); } return true; @@ -173,7 +173,7 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(536); - Set_Enter(13, 58); + Set_Enter(13, kSceneNR05); Scene_Loop_Start_Special(1, 2, 0); return true; } diff --git a/engines/bladerunner/script/scene/nr04.cpp b/engines/bladerunner/script/scene/nr04.cpp index 1d8446f41f..1f5ee4727d 100644 --- a/engines/bladerunner/script/scene/nr04.cpp +++ b/engines/bladerunner/script/scene/nr04.cpp @@ -137,7 +137,7 @@ bool SceneScriptNR04::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(437); - Set_Enter(55, 56); + Set_Enter(55, kSceneNR03); } return true; } diff --git a/engines/bladerunner/script/scene/nr05.cpp b/engines/bladerunner/script/scene/nr05.cpp index 2fa72c2fcd..ac58901f1f 100644 --- a/engines/bladerunner/script/scene/nr05.cpp +++ b/engines/bladerunner/script/scene/nr05.cpp @@ -119,7 +119,7 @@ bool SceneScriptNR05::ClickedOnExit(int exitId) { Actor_Face_Heading(kActorMcCoy, 1021, false); Actor_Change_Animation_Mode(kActorMcCoy, 53); Game_Flag_Set(537); - Set_Enter(55, 56); + Set_Enter(55, kSceneNR03); Scene_Loop_Start_Special(1, 3, 0); } return true; @@ -127,7 +127,7 @@ bool SceneScriptNR05::ClickedOnExit(int exitId) { if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -777.56f, 0.0f, -166.86f, 0, 1, false, 0)) { Game_Flag_Set(546); - Set_Enter(13, 61); + Set_Enter(13, kSceneNR08); } return true; } diff --git a/engines/bladerunner/script/scene/nr06.cpp b/engines/bladerunner/script/scene/nr06.cpp index 6e3dc354d1..25d1148189 100644 --- a/engines/bladerunner/script/scene/nr06.cpp +++ b/engines/bladerunner/script/scene/nr06.cpp @@ -84,7 +84,7 @@ bool SceneScriptNR06::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 48.0f, -71.88f, -26.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Game_Flag_Set(441); - Set_Enter(57, 60); + Set_Enter(57, kSceneNR07); } return true; } @@ -96,7 +96,7 @@ bool SceneScriptNR06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(439); - Set_Enter(13, 61); + Set_Enter(13, kSceneNR08); } return true; } diff --git a/engines/bladerunner/script/scene/nr07.cpp b/engines/bladerunner/script/scene/nr07.cpp index 8e9c7847dc..dde74478b8 100644 --- a/engines/bladerunner/script/scene/nr07.cpp +++ b/engines/bladerunner/script/scene/nr07.cpp @@ -121,7 +121,7 @@ bool SceneScriptNR07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(442); - Set_Enter(56, 59); + Set_Enter(56, kSceneNR06); } return true; } @@ -307,7 +307,7 @@ void SceneScriptNR07::sub_402284() { Actor_Says(kActorDektora, 720, 30); Actor_Says(kActorDektora, 730, 30); Actor_Says(kActorMcCoy, 3685, 13); - Voight_Kampff_Activate(3, 40); + Voight_Kampff_Activate(kActorDektora, 40); if (Game_Flag_Query(47)) { sub_401A10(); } else { diff --git a/engines/bladerunner/script/scene/nr08.cpp b/engines/bladerunner/script/scene/nr08.cpp index b00daff531..346d71a7fe 100644 --- a/engines/bladerunner/script/scene/nr08.cpp +++ b/engines/bladerunner/script/scene/nr08.cpp @@ -97,7 +97,7 @@ bool SceneScriptNR08::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1102.88f, 0.0f, 107.43f, 0, 1, false, 0)) { Game_Flag_Set(547); - Set_Enter(13, 58); + Set_Enter(13, kSceneNR05); } return true; } @@ -106,7 +106,7 @@ bool SceneScriptNR08::ClickedOnExit(int exitId) { Actor_Face_Heading(kActorMcCoy, 505, false); Loop_Actor_Travel_Stairs(kActorMcCoy, 4, 1, 0); Game_Flag_Set(440); - Set_Enter(56, 59); + Set_Enter(56, kSceneNR06); } return true; } @@ -117,7 +117,7 @@ bool SceneScriptNR08::ClickedOnExit(int exitId) { Loop_Actor_Travel_Stairs(kActorMcCoy, 6, 1, 0); Footstep_Sound_Override_Off(); Game_Flag_Set(614); - Set_Enter(58, 62); + Set_Enter(58, kSceneNR09); } } return false; @@ -175,7 +175,7 @@ void SceneScriptNR08::PlayerWalkedIn() { } else { Game_Flag_Set(729); Ambient_Sounds_Play_Sound(566, 27, 0, 99, 0); - Outtake_Play(40, 1, -1); + Outtake_Play(kOuttakeDektora, true, -1); } if (Actor_Query_Goal_Number(kActorDektora) == 245) { Actor_Face_Heading(kActorDektora, 790, false); diff --git a/engines/bladerunner/script/scene/nr09.cpp b/engines/bladerunner/script/scene/nr09.cpp index a10f252492..0fda348f12 100644 --- a/engines/bladerunner/script/scene/nr09.cpp +++ b/engines/bladerunner/script/scene/nr09.cpp @@ -75,7 +75,7 @@ bool SceneScriptNR09::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -564.07f, 0.35f, 399.04f, 0, 1, false, 0)) { Game_Flag_Set(475); - Set_Enter(59, 63); + Set_Enter(59, kSceneNR10); return true; } } @@ -85,7 +85,7 @@ bool SceneScriptNR09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); if (!v1) { Game_Flag_Set(615); - Set_Enter(13, 61); + Set_Enter(13, kSceneNR08); return true; } } diff --git a/engines/bladerunner/script/scene/nr10.cpp b/engines/bladerunner/script/scene/nr10.cpp index 8c07ac47a1..a898daa7d2 100644 --- a/engines/bladerunner/script/scene/nr10.cpp +++ b/engines/bladerunner/script/scene/nr10.cpp @@ -91,7 +91,7 @@ bool SceneScriptNR10::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -152.78f, 2.84f, -238.43f, 0, 1, false, 0)) { Game_Flag_Set(476); - Set_Enter(58, 62); + Set_Enter(58, kSceneNR09); return true; } } @@ -100,7 +100,7 @@ bool SceneScriptNR10::ClickedOnExit(int exitId) { Actor_Face_Heading(kActorMcCoy, 55, false); Loop_Actor_Travel_Ladder(kActorMcCoy, 8, 1, 0); Game_Flag_Set(641); - Set_Enter(60, 64); + Set_Enter(60, kSceneNR11); return true; } } diff --git a/engines/bladerunner/script/scene/nr11.cpp b/engines/bladerunner/script/scene/nr11.cpp index 8c282d3387..915c5a9738 100644 --- a/engines/bladerunner/script/scene/nr11.cpp +++ b/engines/bladerunner/script/scene/nr11.cpp @@ -208,7 +208,7 @@ bool SceneScriptNR11::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 100.0f, 1.75f, -8.0f, 0, 1, false, 0)) { Game_Flag_Set(477); - Set_Enter(59, 63); + Set_Enter(59, kSceneNR10); return true; } } diff --git a/engines/bladerunner/script/scene/ps01.cpp b/engines/bladerunner/script/scene/ps01.cpp index ba9015823d..5e31057dde 100644 --- a/engines/bladerunner/script/scene/ps01.cpp +++ b/engines/bladerunner/script/scene/ps01.cpp @@ -80,7 +80,7 @@ bool SceneScriptPS01::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1920.0f, 16581.0f, -2653.0f, 12, 1, false, 0)) { Game_Flag_Set(718); - Set_Enter(62, 66); + Set_Enter(62, kScenePS02); } return true; } @@ -101,63 +101,63 @@ bool SceneScriptPS01::ClickedOnExit(int exitId) { Game_Flag_Set(182); Game_Flag_Reset(251); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Scene_Loop_Start_Special(1, 4, 1); break; case 1: Game_Flag_Set(179); Game_Flag_Reset(251); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); Scene_Loop_Start_Special(1, 4, 1); break; case 3: Game_Flag_Set(176); Game_Flag_Reset(251); 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(251); 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(251); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); Scene_Loop_Start_Special(1, 4, 1); break; case 6: Game_Flag_Set(177); Game_Flag_Reset(251); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); Scene_Loop_Start_Special(1, 4, 1); break; case 7: Game_Flag_Set(258); Game_Flag_Reset(251); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); Scene_Loop_Start_Special(1, 4, 1); break; case 8: Game_Flag_Set(181); Game_Flag_Reset(251); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); Scene_Loop_Start_Special(1, 4, 1); break; case 9: Game_Flag_Set(257); Game_Flag_Reset(251); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); Scene_Loop_Start_Special(1, 4, 1); break; default: @@ -267,7 +267,7 @@ void SceneScriptPS01::PlayerWalkedOut() { if (!Game_Flag_Query(718) && Global_Variable_Query(1) == 1) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(38, 1, -1); + Outtake_Play(kOuttakeTowards3, true, -1); } } diff --git a/engines/bladerunner/script/scene/ps02.cpp b/engines/bladerunner/script/scene/ps02.cpp index 0fe062b099..16e23b0dba 100644 --- a/engines/bladerunner/script/scene/ps02.cpp +++ b/engines/bladerunner/script/scene/ps02.cpp @@ -53,34 +53,34 @@ bool SceneScriptPS02::ClickedOn3DObject(const char *objectName, bool a2) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 3, 1); } } else if (Game_Flag_Query(22) ) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(15, 69); + Set_Enter(15, kScenePS05); Scene_Loop_Start_Special(1, 3, 1); } } else if (Game_Flag_Query(131) ) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(66, 71); + Set_Enter(66, kScenePS07); Scene_Loop_Start_Special(1, 3, 1); } } else if (Game_Flag_Query(132) ) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(63, 67); + Set_Enter(63, kScenePS03); Scene_Loop_Start_Special(1, 3, 1); } } else if (Game_Flag_Query(133) && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(67, 72); + Set_Enter(67, kScenePS09); Scene_Loop_Start_Special(1, 3, 1); } } @@ -123,19 +123,19 @@ void SceneScriptPS02::PlayerWalkedIn() { sub_4018BC(); Player_Loses_Control(); if (Game_Flag_Query(130) ) { - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); Scene_Loop_Start_Special(1, 3, 1); } else if (Game_Flag_Query(22) ) { - Set_Enter(15, 69); + Set_Enter(15, kScenePS05); Scene_Loop_Start_Special(1, 3, 1); } else if (Game_Flag_Query(131) ) { - Set_Enter(66, 71); + Set_Enter(66, kScenePS07); Scene_Loop_Start_Special(1, 3, 1); } else if (Game_Flag_Query(132) ) { - Set_Enter(63, 67); + Set_Enter(63, kScenePS03); Scene_Loop_Start_Special(1, 3, 1); } else if (Game_Flag_Query(133) ) { - Set_Enter(67, 72); + Set_Enter(67, kScenePS09); Scene_Loop_Start_Special(1, 3, 1); } //return true; diff --git a/engines/bladerunner/script/scene/ps03.cpp b/engines/bladerunner/script/scene/ps03.cpp index d56e0aa943..cad54b7768 100644 --- a/engines/bladerunner/script/scene/ps03.cpp +++ b/engines/bladerunner/script/scene/ps03.cpp @@ -79,7 +79,7 @@ bool SceneScriptPS03::ClickedOnExit(int exitId) { Game_Flag_Set(42); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(64, 68); + Set_Enter(64, kScenePS04); } return true; } @@ -87,7 +87,7 @@ bool SceneScriptPS03::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -569.54f, -354.62f, -1076.15f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(62, 66); + Set_Enter(62, kScenePS02); Game_Flag_Reset(478); if (Global_Variable_Query(1) < 4) { Actor_Set_Goal_Number(kActorGuzza, 100); @@ -100,7 +100,7 @@ bool SceneScriptPS03::ClickedOnExit(int exitId) { Game_Flag_Set(134); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(68, 77); + Set_Enter(68, kScenePS14); } return true; } diff --git a/engines/bladerunner/script/scene/ps04.cpp b/engines/bladerunner/script/scene/ps04.cpp index a6b855ed2f..ef0b2d64c5 100644 --- a/engines/bladerunner/script/scene/ps04.cpp +++ b/engines/bladerunner/script/scene/ps04.cpp @@ -103,7 +103,7 @@ bool SceneScriptPS04::ClickedOnExit(int exitId) { Game_Flag_Set(39); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(63, 67); + Set_Enter(63, kScenePS03); } return true; } diff --git a/engines/bladerunner/script/scene/ps05.cpp b/engines/bladerunner/script/scene/ps05.cpp index 32eb5d5b46..c93db0b22f 100644 --- a/engines/bladerunner/script/scene/ps05.cpp +++ b/engines/bladerunner/script/scene/ps05.cpp @@ -99,7 +99,7 @@ bool SceneScriptPS05::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 2, 24, 1, false)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(101, 119); + Set_Enter(101, kScenePS15); } return true; } @@ -107,7 +107,7 @@ bool SceneScriptPS05::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 635.0f, 0.0f, -598.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(62, 66); + Set_Enter(62, kScenePS02); } return true; } @@ -116,7 +116,7 @@ bool SceneScriptPS05::ClickedOnExit(int exitId) { Game_Flag_Set(136); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(65, 70); + Set_Enter(65, kScenePS06); } return true; } diff --git a/engines/bladerunner/script/scene/ps06.cpp b/engines/bladerunner/script/scene/ps06.cpp index f51ee7cf01..bf25f799ce 100644 --- a/engines/bladerunner/script/scene/ps06.cpp +++ b/engines/bladerunner/script/scene/ps06.cpp @@ -106,7 +106,7 @@ bool SceneScriptPS06::ClickedOnExit(int exitId) { Game_Flag_Set(23); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(15, 69); + Set_Enter(15, kScenePS05); return true; } return false; diff --git a/engines/bladerunner/script/scene/ps07.cpp b/engines/bladerunner/script/scene/ps07.cpp index ffe51c2f63..01285f5280 100644 --- a/engines/bladerunner/script/scene/ps07.cpp +++ b/engines/bladerunner/script/scene/ps07.cpp @@ -137,7 +137,7 @@ bool SceneScriptPS07::ClickedOnItem(int itemId, bool a2) { bool SceneScriptPS07::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 609.07f, 0.22f, -598.67f, 0, 0, false, 0)) { - Set_Enter(62, 66); + Set_Enter(62, kScenePS02); } return true; } diff --git a/engines/bladerunner/script/scene/ps09.cpp b/engines/bladerunner/script/scene/ps09.cpp index 848999063e..8b21415564 100644 --- a/engines/bladerunner/script/scene/ps09.cpp +++ b/engines/bladerunner/script/scene/ps09.cpp @@ -179,7 +179,7 @@ bool SceneScriptPS09::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -559.15f, 0.0f, -85.06f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(62, 66); + Set_Enter(62, kScenePS02); Game_Flag_Reset(211); } return true; @@ -340,7 +340,7 @@ void SceneScriptPS09::sub_402090() { Actor_Says(kActorGrigorian, 410, 16); Actor_Says(kActorMcCoy, 4405, 14); Actor_Says(kActorMcCoy, 4410, 15); - Voight_Kampff_Activate(11, 20); + Voight_Kampff_Activate(kActorGrigorian, 20); Actor_Modify_Friendliness_To_Other(kActorGrigorian, kActorMcCoy, -10); break; case 210: diff --git a/engines/bladerunner/script/scene/ps10.cpp b/engines/bladerunner/script/scene/ps10.cpp index 5811bdcc7a..059f802fa0 100644 --- a/engines/bladerunner/script/scene/ps10.cpp +++ b/engines/bladerunner/script/scene/ps10.cpp @@ -190,7 +190,7 @@ bool SceneScriptPS10::ClickedOnExit(int exitId) { sub_402238(); Global_Variable_Decrement(9, 20 - Global_Variable_Query(10)); Global_Variable_Set(10, 20); - Set_Enter(14, 74); + Set_Enter(14, kScenePS11); } return true; } diff --git a/engines/bladerunner/script/scene/ps11.cpp b/engines/bladerunner/script/scene/ps11.cpp index dba7f1abd5..f3dd32b322 100644 --- a/engines/bladerunner/script/scene/ps11.cpp +++ b/engines/bladerunner/script/scene/ps11.cpp @@ -226,7 +226,7 @@ bool SceneScriptPS11::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 6, 12, 1, false)) { Game_Flag_Set(15); sub_402744(); - Set_Enter(14, 73); + Set_Enter(14, kScenePS10); } return true; } @@ -236,7 +236,7 @@ bool SceneScriptPS11::ClickedOnExit(int exitId) { sub_402744(); Global_Variable_Decrement(9, 20 - Global_Variable_Query(11)); Global_Variable_Set(11, 20); - Set_Enter(14, 75); + Set_Enter(14, kScenePS12); } return true; } diff --git a/engines/bladerunner/script/scene/ps12.cpp b/engines/bladerunner/script/scene/ps12.cpp index f93af346b7..04322f28dd 100644 --- a/engines/bladerunner/script/scene/ps12.cpp +++ b/engines/bladerunner/script/scene/ps12.cpp @@ -235,7 +235,7 @@ bool SceneScriptPS12::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 8, 12, 1, false)) { Game_Flag_Set(17); sub_4028C4(); - Set_Enter(14, 74); + Set_Enter(14, kScenePS11); } return true; } @@ -248,7 +248,7 @@ bool SceneScriptPS12::ClickedOnExit(int exitId) { sub_4028C4(); Global_Variable_Decrement(9, 20 - Global_Variable_Query(12)); Global_Variable_Set(12, 20); - Set_Enter(14, 76); + Set_Enter(14, kScenePS13); } return true; } diff --git a/engines/bladerunner/script/scene/ps13.cpp b/engines/bladerunner/script/scene/ps13.cpp index c2c46335a3..ac0509dfde 100644 --- a/engines/bladerunner/script/scene/ps13.cpp +++ b/engines/bladerunner/script/scene/ps13.cpp @@ -219,7 +219,7 @@ bool SceneScriptPS13::ClickedOnExit(int exitId) { if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 10, 12, 1, false)) { Game_Flag_Set(19); sub_40267C(); - Set_Enter(14, 75); + Set_Enter(14, kScenePS12); } return true; } @@ -237,7 +237,7 @@ bool SceneScriptPS13::ClickedOnExit(int exitId) { Global_Variable_Reset(12); Global_Variable_Reset(13); Global_Variable_Reset(9); - Set_Enter(15, 69); + Set_Enter(15, kScenePS05); } return true; } diff --git a/engines/bladerunner/script/scene/ps14.cpp b/engines/bladerunner/script/scene/ps14.cpp index f7e538ebd1..f68936ee99 100644 --- a/engines/bladerunner/script/scene/ps14.cpp +++ b/engines/bladerunner/script/scene/ps14.cpp @@ -83,7 +83,7 @@ bool SceneScriptPS14::ClickedOnExit(int exitId) { Loop_Actor_Travel_Stairs(kActorMcCoy, 3, 0, 0); } else { Game_Flag_Set(135); - Set_Enter(63, 67); + Set_Enter(63, kScenePS03); } } return true; @@ -93,7 +93,7 @@ bool SceneScriptPS14::ClickedOnExit(int exitId) { Game_Flag_Set(673); Game_Flag_Reset(178); Game_Flag_Set(179); - Set_Enter(53, 53); + Set_Enter(53, kSceneMA07); } return true; } diff --git a/engines/bladerunner/script/scene/ps15.cpp b/engines/bladerunner/script/scene/ps15.cpp index bb1c451223..4d0a350818 100644 --- a/engines/bladerunner/script/scene/ps15.cpp +++ b/engines/bladerunner/script/scene/ps15.cpp @@ -108,7 +108,7 @@ bool SceneScriptPS15::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(204); - Set_Enter(15, 69); + Set_Enter(15, kScenePS05); } return true; } @@ -119,7 +119,7 @@ bool SceneScriptPS15::ClickedOnExit(int exitId) { Sound_Play(155, 90, 0, 0, 50); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(14, 73); + Set_Enter(14, kScenePS10); } return true; } diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp index 347f0e8dcb..fd1304d5df 100644 --- a/engines/bladerunner/script/scene/rc01.cpp +++ b/engines/bladerunner/script/scene/rc01.cpp @@ -27,7 +27,7 @@ namespace BladeRunner { void SceneScriptRC01::InitializeScene() { #if BLADERUNNER_DEBUG_GAME //TODO: not part of game, remove - Game_Flag_Set(kFlagIntroPlayed); // force skip intro + // Game_Flag_Set(kFlagIntroPlayed); // force skip intro Game_Flag_Set(kFlagRC02toRC01); // no landing // Game_Flag_Set(kFlagRC01PoliceDone); // Game_Flag_Set(kFlagKIAPrivacyAddon); @@ -212,7 +212,7 @@ bool SceneScriptRC01::ClickedOn3DObject(const char *objectName, bool a2) { || Object_Query_Click("70_3", objectName) || Object_Query_Click("70_5", objectName) || Object_Query_Click("70_6", objectName)) { - sub_403850(); + investigateCrowd(); return true; } @@ -345,7 +345,6 @@ bool SceneScriptRC01::ClickedOnItem(int itemId, bool a2) { return true; } return false; - } void SceneScriptRC01::walkToCenter() { @@ -367,7 +366,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { case 1: case 4: Game_Flag_Set(8); - Set_Enter(16, 79); + Set_Enter(16, kSceneRC02); break; case 2: case 3: @@ -416,7 +415,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(178); Game_Flag_Reset(249); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -427,7 +426,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(179); Game_Flag_Reset(249); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -438,7 +437,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(176); Game_Flag_Reset(249); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -449,7 +448,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(261); Game_Flag_Reset(249); Game_Flag_Set(307); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -460,7 +459,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(180); Game_Flag_Reset(249); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -471,7 +470,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(177); Game_Flag_Reset(249); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -482,7 +481,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(258); Game_Flag_Reset(249); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -493,7 +492,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(181); Game_Flag_Reset(249); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -504,7 +503,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(257); Game_Flag_Reset(249); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); if (Game_Flag_Query(kFlagRC01PoliceDone)) { Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 9, true); } else { @@ -523,14 +522,14 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) { Game_Flag_Set(115); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Set_Enter(70, 80); + Set_Enter(70, kSceneRC03); } return true; } return false; } -void SceneScriptRC01::sub_403850() { +void SceneScriptRC01::investigateCrowd() { if (!Game_Flag_Query(kFlagRC01PoliceDone) && !Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "BARICADE03", 36, true, false)) { Actor_Set_Goal_Number(kActorOfficerLeary, 0); Actor_Face_Object(kActorMcCoy, "BARICADE03", true); @@ -545,7 +544,7 @@ void SceneScriptRC01::sub_403850() { bool SceneScriptRC01::ClickedOn2DRegion(int region) { if (region == 0) { - sub_403850(); + investigateCrowd(); return true; } return false; @@ -613,7 +612,7 @@ void SceneScriptRC01::PlayerWalkedOut() { if (!Game_Flag_Query(8) && !Game_Flag_Query(115) && Global_Variable_Query(1)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(31, 1, -1); + Outtake_Play(kOuttakeAway2, 1, -1); } // return 1; } diff --git a/engines/bladerunner/script/scene/rc02.cpp b/engines/bladerunner/script/scene/rc02.cpp index 18a08ad5b1..02dd4ee699 100644 --- a/engines/bladerunner/script/scene/rc02.cpp +++ b/engines/bladerunner/script/scene/rc02.cpp @@ -127,7 +127,7 @@ bool SceneScriptRC02::ClickedOn3DObject(const char *objectName, bool a2) { return false; } -void SceneScriptRC02::sub_402A7C() { +void SceneScriptRC02::dialogueWithRunciter() { Dialogue_Menu_Clear_List(); DM_Add_To_List_Never_Repeat_Once_Selected(0, 5, 6, 2); DM_Add_To_List_Never_Repeat_Once_Selected(10, 5, 4, 8); @@ -260,7 +260,7 @@ bool SceneScriptRC02::ClickedOnActor(int actorId) { if (Game_Flag_Query(187)) { if (Player_Query_Agenda() == 0) { Game_Flag_Reset(0); - sub_402A7C(); + dialogueWithRunciter(); AI_Movement_Track_Unpause(kActorRunciter); return true; } @@ -289,7 +289,7 @@ bool SceneScriptRC02::ClickedOnActor(int actorId) { AI_Movement_Track_Unpause(kActorRunciter); return true; } - sub_402A7C(); + dialogueWithRunciter(); AI_Movement_Track_Unpause(kActorRunciter); return true; } @@ -320,14 +320,14 @@ bool SceneScriptRC02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_Looping_Sound(75, true); Ambient_Sounds_Adjust_Looping_Sound(85, 100, -101, 1); Actor_Set_Goal_Number(kActorRunciter, 0); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -20.2f, -1238.73f, 108152.73f, 0, 1, false, 0)) { Async_Actor_Walk_To_XYZ(kActorMcCoy, -8.87f, -1238.89f, 108076.27f, 0, false); - Set_Enter(16, 107); + Set_Enter(16, kSceneRC51); } return true; } diff --git a/engines/bladerunner/script/scene/rc03.cpp b/engines/bladerunner/script/scene/rc03.cpp index 2af0a8e8ef..6f7bdad3cc 100644 --- a/engines/bladerunner/script/scene/rc03.cpp +++ b/engines/bladerunner/script/scene/rc03.cpp @@ -141,7 +141,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { Game_Flag_Set(702); } Game_Flag_Set(kFlagRC03toRC01); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); Actor_Set_Goal_Number(kActorDektora, 100); } return true; @@ -154,7 +154,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { Game_Flag_Set(116); Game_Flag_Reset(182); Game_Flag_Set(180); - Set_Enter(0, 1); + Set_Enter(0, kSceneAR02); } return true; } @@ -166,7 +166,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { if (Game_Flag_Query(289)) { Game_Flag_Set(702); } - Set_Enter(74, 86); + Set_Enter(74, kSceneUG01); Actor_Set_Goal_Number(kActorDektora, 100); } return true; @@ -179,7 +179,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { if (Game_Flag_Query(289)) { Game_Flag_Set(702); } - Set_Enter(8, 106); + Set_Enter(8, kSceneHC04); Actor_Set_Goal_Number(kActorDektora, 100); } return true; @@ -190,7 +190,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) { Actor_Says(kActorMcCoy, 8522, 14); } else { Game_Flag_Set(120); - Set_Enter(71, 81); + Set_Enter(71, kSceneRC04); } } return true; diff --git a/engines/bladerunner/script/scene/rc04.cpp b/engines/bladerunner/script/scene/rc04.cpp index 827f836414..72f50588a9 100644 --- a/engines/bladerunner/script/scene/rc04.cpp +++ b/engines/bladerunner/script/scene/rc04.cpp @@ -372,7 +372,7 @@ bool SceneScriptRC04::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 45.0f, 0.15f, 68.0f, 0, 1, false, 0)) { Game_Flag_Set(121); - Set_Enter(70, 80); + Set_Enter(70, kSceneRC03); } return true; } diff --git a/engines/bladerunner/script/scene/rc51.cpp b/engines/bladerunner/script/scene/rc51.cpp index c19a0ff7ce..33c8549017 100644 --- a/engines/bladerunner/script/scene/rc51.cpp +++ b/engines/bladerunner/script/scene/rc51.cpp @@ -101,7 +101,7 @@ bool SceneScriptRC51::ClickedOnItem(int itemId, bool a2) { bool SceneScriptRC51::ClickedOnExit(int exitId) { if (exitId == 0 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -8.87f, -1238.89f, 108173.27f, 0, 1, false, 0)) { - Set_Enter(16, 79); + Set_Enter(16, kSceneRC02); return true; } return false; diff --git a/engines/bladerunner/script/scene/tb02.cpp b/engines/bladerunner/script/scene/tb02.cpp index 801481f4c4..301fa98f46 100644 --- a/engines/bladerunner/script/scene/tb02.cpp +++ b/engines/bladerunner/script/scene/tb02.cpp @@ -34,7 +34,7 @@ void SceneScriptTB02::InitializeScene() { } else { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(27, 0, -1); + Outtake_Play(kOuttakeTyrellBuildingFly, false, -1); Setup_Scene_Information(-304.0f, -81.46f, 1434.0f, 250); } if (Global_Variable_Query(1) > 3) { @@ -158,7 +158,7 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(154); Game_Flag_Reset(450); - Set_Enter(17, 83); + Set_Enter(17, kSceneTB03); Async_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1890.0f, 0, false); } return true; @@ -170,9 +170,9 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) { if (Global_Variable_Query(1) < 4) { Game_Flag_Set(451); Game_Flag_Set(96); - Set_Enter(72, 84); + Set_Enter(72, kSceneTB05); } else { - Set_Enter(18, 108); + Set_Enter(18, kSceneTB07); } } return true; @@ -197,55 +197,55 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) { Game_Flag_Set(257); Game_Flag_Reset(307); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); break; case 8: Game_Flag_Set(181); Game_Flag_Reset(307); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); break; case 7: Game_Flag_Set(258); Game_Flag_Reset(307); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); break; case 6: Game_Flag_Set(177); Game_Flag_Reset(307); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); break; case 4: Game_Flag_Set(180); Game_Flag_Reset(307); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); break; case 3: Game_Flag_Set(176); Game_Flag_Reset(307); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); break; case 2: Game_Flag_Set(182); Game_Flag_Reset(307); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); break; case 1: Game_Flag_Set(179); Game_Flag_Reset(307); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); break; case 0: Game_Flag_Set(178); Game_Flag_Reset(307); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); break; default: Game_Flag_Set(261); @@ -270,7 +270,7 @@ void SceneScriptTB02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo void SceneScriptTB02::PlayerWalkedIn() { if (Game_Flag_Query(625) && ((Game_Flag_Reset(625) , Global_Variable_Query(1) == 2) || Global_Variable_Query(1) == 3)) { - Set_Enter(18, 108); + Set_Enter(18, kSceneTB07); //return true; return; } diff --git a/engines/bladerunner/script/scene/tb03.cpp b/engines/bladerunner/script/scene/tb03.cpp index 0c05c5599e..599e321402 100644 --- a/engines/bladerunner/script/scene/tb03.cpp +++ b/engines/bladerunner/script/scene/tb03.cpp @@ -108,7 +108,7 @@ bool SceneScriptTB03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(447); - Set_Enter(88, 101); + Set_Enter(88, kSceneUG17); } return true; } @@ -117,7 +117,7 @@ bool SceneScriptTB03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(155); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); Async_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1702.0f, 0, false); } return true; diff --git a/engines/bladerunner/script/scene/tb05.cpp b/engines/bladerunner/script/scene/tb05.cpp index 8971fdf46b..0b1bd1c672 100644 --- a/engines/bladerunner/script/scene/tb05.cpp +++ b/engines/bladerunner/script/scene/tb05.cpp @@ -151,7 +151,7 @@ bool SceneScriptTB05::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.0f, 151.53f, -205.0f, 12, 1, false, 0)) { Game_Flag_Set(97); - Set_Enter(73, 85); + Set_Enter(73, kSceneTB06); Scene_Loop_Start_Special(1, 2, 1); } return true; @@ -159,7 +159,7 @@ bool SceneScriptTB05::ClickedOnExit(int exitId) { if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 14.0f, 147.12f, 123.0f, 0, 1, false, 0)) { Game_Flag_Set(95); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); } return true; } diff --git a/engines/bladerunner/script/scene/tb06.cpp b/engines/bladerunner/script/scene/tb06.cpp index 6a28d760c7..5642281d26 100644 --- a/engines/bladerunner/script/scene/tb06.cpp +++ b/engines/bladerunner/script/scene/tb06.cpp @@ -128,7 +128,7 @@ bool SceneScriptTB06::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -16.0f, 149.0f, -427.0f, 12, 1, false, 0)) { Game_Flag_Set(98); - Set_Enter(72, 84); + Set_Enter(72, kSceneTB05); Scene_Loop_Start_Special(1, 2, 1); } return true; diff --git a/engines/bladerunner/script/scene/tb07.cpp b/engines/bladerunner/script/scene/tb07.cpp index efd4fba197..5a249c649e 100644 --- a/engines/bladerunner/script/scene/tb07.cpp +++ b/engines/bladerunner/script/scene/tb07.cpp @@ -83,7 +83,7 @@ bool SceneScriptTB07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Looping_Sounds(1); if (Global_Variable_Query(1) == 4) { Game_Flag_Set(608); - Set_Enter(17, 82); + Set_Enter(17, kSceneTB02); } else { Game_Flag_Reset(176); Game_Flag_Reset(182); @@ -98,55 +98,55 @@ bool SceneScriptTB07::ClickedOnExit(int exitId) { Game_Flag_Set(257); Game_Flag_Reset(307); Game_Flag_Set(256); - Set_Enter(37, 34); + Set_Enter(37, kSceneHF01); break; case 8: Game_Flag_Set(181); Game_Flag_Reset(307); Game_Flag_Set(255); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); break; case 7: Game_Flag_Set(258); Game_Flag_Reset(307); Game_Flag_Set(254); - Set_Enter(20, 2); + Set_Enter(20, kSceneBB01); break; case 6: Game_Flag_Set(177); Game_Flag_Reset(307); Game_Flag_Set(253); - Set_Enter(7, 25); + Set_Enter(7, kSceneDR01); break; case 4: Game_Flag_Set(180); Game_Flag_Reset(307); Game_Flag_Set(252); - Set_Enter(0, 0); + Set_Enter(0, kSceneAR01); break; case 3: Game_Flag_Set(176); Game_Flag_Reset(307); Game_Flag_Set(248); - Set_Enter(4, 13); + Set_Enter(4, kSceneCT01); break; case 2: Game_Flag_Set(182); Game_Flag_Reset(307); Game_Flag_Set(249); - Set_Enter(69, 78); + Set_Enter(69, kSceneRC01); break; case 1: Game_Flag_Set(179); Game_Flag_Reset(307); Game_Flag_Set(250); - Set_Enter(49, 48); + Set_Enter(49, kSceneMA01); break; case 0: Game_Flag_Set(178); Game_Flag_Reset(307); Game_Flag_Set(251); - Set_Enter(61, 65); + Set_Enter(61, kScenePS01); break; default: Game_Flag_Set(261); @@ -198,7 +198,7 @@ void SceneScriptTB07::sub_401B0C() { Actor_Put_In_Set(kActorRachael, 18); Actor_Set_At_XYZ(kActorRachael, -260.15f, 12.0f, -19.16f, 256); Actor_Change_Animation_Mode(kActorRachael, 0); - Outtake_Play(39, 1, -1); + Outtake_Play(kOuttakeRachel, true, -1); Loop_Actor_Walk_To_XYZ(kActorRachael, -146.15f, 12.0f, -5.84f, 0, 0, false, 0); Actor_Face_Actor(kActorRachael, kActorMcCoy, true); Actor_Says(kActorRachael, 480, 14); diff --git a/engines/bladerunner/script/scene/ug01.cpp b/engines/bladerunner/script/scene/ug01.cpp index 91d0d63467..a1dde296e8 100644 --- a/engines/bladerunner/script/scene/ug01.cpp +++ b/engines/bladerunner/script/scene/ug01.cpp @@ -101,7 +101,7 @@ bool SceneScriptUG01::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -32.0f, -50.13f, -1350.0f, 12, 1, false, 0)) { Game_Flag_Set(316); - Set_Enter(83, 95); + Set_Enter(83, kSceneUG10); } return true; } @@ -112,14 +112,14 @@ bool SceneScriptUG01::ClickedOnExit(int exitId) { Game_Flag_Set(119); Game_Flag_Reset(259); Game_Flag_Set(182); - Set_Enter(70, 80); + Set_Enter(70, kSceneRC03); } return true; } if (exitId == 2) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -126.0f, -50.13f, -286.0f, 0, 1, false, 0)) { Game_Flag_Set(314); - Set_Enter(75, 87); + Set_Enter(75, kSceneUG02); } return true; } diff --git a/engines/bladerunner/script/scene/ug02.cpp b/engines/bladerunner/script/scene/ug02.cpp index ed2cef490e..af91b5a060 100644 --- a/engines/bladerunner/script/scene/ug02.cpp +++ b/engines/bladerunner/script/scene/ug02.cpp @@ -157,7 +157,7 @@ bool SceneScriptUG02::ClickedOnExit(int exitId) { int v4 = Player_Query_Combat_Mode(); Loop_Actor_Walk_To_XYZ(kActorMcCoy, -95.0f, 74.870003f, -503.0f, 0, 0, v4, 0); Game_Flag_Set(315); - Set_Enter(74, 86); + Set_Enter(74, kSceneUG01); } } return true; @@ -181,7 +181,7 @@ bool SceneScriptUG02::ClickedOnExit(int exitId) { Game_Flag_Set(403); Item_Remove_From_World(121); } - Set_Enter(8, 33); + Set_Enter(8, kSceneHC03); return true; } return false; diff --git a/engines/bladerunner/script/scene/ug03.cpp b/engines/bladerunner/script/scene/ug03.cpp index 64a56dc342..d5d80c9d90 100644 --- a/engines/bladerunner/script/scene/ug03.cpp +++ b/engines/bladerunner/script/scene/ug03.cpp @@ -106,7 +106,7 @@ bool SceneScriptUG03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(336); - Set_Enter(83, 95); + Set_Enter(83, kSceneUG10); } } return true; @@ -116,7 +116,7 @@ bool SceneScriptUG03::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(334); - Set_Enter(77, 89); + Set_Enter(77, kSceneUG04); } return true; } diff --git a/engines/bladerunner/script/scene/ug04.cpp b/engines/bladerunner/script/scene/ug04.cpp index 1166b84e1e..13fb0d472c 100644 --- a/engines/bladerunner/script/scene/ug04.cpp +++ b/engines/bladerunner/script/scene/ug04.cpp @@ -88,21 +88,21 @@ bool SceneScriptUG04::ClickedOnExit(int exitId) { if (exitId == 0) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -172.0f, 16.29f, -735.0f, 0, 1, false, 0)) { Game_Flag_Set(335); - Set_Enter(76, 88); + Set_Enter(76, kSceneUG03); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 0.0f, -1.74f, -2400.0f, 0, 1, false, 0)) { Game_Flag_Set(338); - Set_Enter(78, 90); + Set_Enter(78, kSceneUG05); } return true; } if (exitId == 2) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 164.0f, 11.87f, -1013.0f, 0, 1, false, 0)) { Game_Flag_Set(340); - Set_Enter(79, 91); + Set_Enter(79, kSceneUG06); } return true; } diff --git a/engines/bladerunner/script/scene/ug05.cpp b/engines/bladerunner/script/scene/ug05.cpp index c1f25be009..3a66f5e45a 100644 --- a/engines/bladerunner/script/scene/ug05.cpp +++ b/engines/bladerunner/script/scene/ug05.cpp @@ -116,19 +116,19 @@ bool SceneScriptUG05::ClickedOnExit(int exitId) { if (Game_Flag_Query(663) && !Game_Flag_Query(368)) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -356.35f, 132.77f, -1092.36f, 0, 0, false, 0); Game_Flag_Set(361); - Set_Enter(43, 40); + Set_Enter(43, kSceneHF07); } else if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -156.72f, 3.03f, -1118.17f, 0, 1, false, 0)) { Actor_Face_Heading(kActorMcCoy, 760, false); Loop_Actor_Travel_Stairs(kActorMcCoy, 3, 1, 0); Game_Flag_Set(361); - Set_Enter(43, 40); + Set_Enter(43, kSceneHF07); } return true; } if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 4.0f, -11.67f, -4.0f, 0, 1, false, 0)) { Game_Flag_Set(339); - Set_Enter(77, 89); + Set_Enter(77, kSceneUG04); } return true; } @@ -237,7 +237,7 @@ void SceneScriptUG05::sub_402218() { Actor_Face_Actor(kActorMcCoy, v0, true); Actor_Face_Actor(v0, kActorMcCoy, true); Actor_Says(kActorMcCoy, 5535, 13); - if (v0 == 3) { + if (v0 == kActorDektora) { Actor_Says(kActorDektora, 1110, 15); } else { Actor_Says(kActorLucy, 670, 17); @@ -248,27 +248,27 @@ void SceneScriptUG05::sub_402218() { if (v0 == kActorLucy) { if (Game_Flag_Query(46)) { if (Global_Variable_Query(48) > 3) { - Outtake_Play(13, 0, -1); + Outtake_Play(kOuttakeEnd1B, false, -1); } else { - Outtake_Play(14, 0, -1); + Outtake_Play(kOuttakeEnd1C, false, -1); } } else { - Outtake_Play(12, 0, -1); + Outtake_Play(kOuttakeEnd1A, false, -1); } } else if (v0 == kActorDektora) { if (Game_Flag_Query(47)) { if (Global_Variable_Query(48) > 3) { - Outtake_Play(16, 0, -1); + Outtake_Play(kOuttakeEnd1E, false, -1); } else { - Outtake_Play(17, 0, -1); + Outtake_Play(kOuttakeEnd1F, false, -1); } } else { - Outtake_Play(15, 0, -1); + Outtake_Play(kOuttakeEnd1D, false, -1); } } else { - Outtake_Play(19, 0, -1); + Outtake_Play(kOuttakeEnd3, false, -1); } - Outtake_Play(18, 0, -1); + Outtake_Play(kOuttakeEnd2, false, -1); Game_Over(); } diff --git a/engines/bladerunner/script/scene/ug06.cpp b/engines/bladerunner/script/scene/ug06.cpp index ca3501f9a0..55a84442f9 100644 --- a/engines/bladerunner/script/scene/ug06.cpp +++ b/engines/bladerunner/script/scene/ug06.cpp @@ -28,11 +28,11 @@ void SceneScriptUG06::InitializeScene() { if (Game_Flag_Query(680)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(7, 0, -1); + Outtake_Play(kOuttakeMovieC1, false, -1); if (Game_Flag_Query(560)) { - Outtake_Play(9, 0, -1); + Outtake_Play(kOuttakeMovieC3, false, -1); } else { - Outtake_Play(8, 0, -1); + Outtake_Play(kOuttakeMovieC2, false, -1); } Game_Flag_Reset(680); } @@ -95,7 +95,7 @@ bool SceneScriptUG06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(341); - Set_Enter(77, 89); + Set_Enter(77, kSceneUG04); } return true; } @@ -107,7 +107,7 @@ bool SceneScriptUG06::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(342); - Set_Enter(54, 54); + Set_Enter(54, kSceneNR01); } return true; } diff --git a/engines/bladerunner/script/scene/ug07.cpp b/engines/bladerunner/script/scene/ug07.cpp index ff7dc7b06a..fdb61c766a 100644 --- a/engines/bladerunner/script/scene/ug07.cpp +++ b/engines/bladerunner/script/scene/ug07.cpp @@ -98,7 +98,7 @@ bool SceneScriptUG07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(427); - Set_Enter(82, 94); + Set_Enter(82, kSceneUG09); return true; } } @@ -107,7 +107,7 @@ bool SceneScriptUG07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(425); - Set_Enter(81, 93); + Set_Enter(81, kSceneUG08); return true; } } @@ -146,7 +146,7 @@ bool SceneScriptUG07::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(423); - Set_Enter(83, 95); + Set_Enter(83, kSceneUG10); return true; } } diff --git a/engines/bladerunner/script/scene/ug08.cpp b/engines/bladerunner/script/scene/ug08.cpp index 0d68ec983b..667fa620fe 100644 --- a/engines/bladerunner/script/scene/ug08.cpp +++ b/engines/bladerunner/script/scene/ug08.cpp @@ -89,7 +89,7 @@ bool SceneScriptUG08::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(426); - Set_Enter(80, 92); + Set_Enter(80, kSceneUG07); } } else if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -312.0f, -2.0f, 152.0f, 0, 1, false, 0)) { @@ -102,7 +102,7 @@ bool SceneScriptUG08::ClickedOnExit(int exitId) { Actor_Set_Invisible(kActorMcCoy, true); Game_Flag_Set(429); Game_Flag_Reset(431); - Set_Enter(85, 97); + Set_Enter(85, kSceneUG13); Scene_Loop_Start_Special(1, 3, 0); } } diff --git a/engines/bladerunner/script/scene/ug09.cpp b/engines/bladerunner/script/scene/ug09.cpp index 8ff3b7f74b..f217b3df67 100644 --- a/engines/bladerunner/script/scene/ug09.cpp +++ b/engines/bladerunner/script/scene/ug09.cpp @@ -104,7 +104,7 @@ bool SceneScriptUG09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(432); - Set_Enter(4, 24); + Set_Enter(4, kSceneCT12); } return true; } @@ -113,7 +113,7 @@ bool SceneScriptUG09::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(428); - Set_Enter(80, 92); + Set_Enter(80, kSceneUG07); } return true; } diff --git a/engines/bladerunner/script/scene/ug10.cpp b/engines/bladerunner/script/scene/ug10.cpp index 1f07c6d828..2568e433cd 100644 --- a/engines/bladerunner/script/scene/ug10.cpp +++ b/engines/bladerunner/script/scene/ug10.cpp @@ -104,7 +104,7 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) { if ((!Game_Flag_Query(474) && x > 125.0f) || Game_Flag_Query(474)) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 235.0f, 1.15f, 29.0f, 0, 1, false, 0)) { Game_Flag_Set(317); - Set_Enter(74, 86); + Set_Enter(74, kSceneUG01); return true; } } else if (!Game_Flag_Query(474)) { @@ -117,7 +117,7 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) { Loop_Actor_Travel_Stairs(kActorMcCoy, 9, 1, 0); Loop_Actor_Walk_To_XYZ(kActorMcCoy, -92.0f, 81.83f, -652.0f, 0, 0, false, 0); Game_Flag_Set(337); - Set_Enter(76, 88); + Set_Enter(76, kSceneUG03); return true; } } else if (!Game_Flag_Query(474)) { @@ -129,7 +129,7 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) { Actor_Face_Heading(kActorMcCoy, 1001, false); Loop_Actor_Travel_Ladder(kActorMcCoy, 1, 1, 0); Game_Flag_Set(424); - Set_Enter(80, 92); + Set_Enter(80, kSceneUG07); return true; } } else if (!Game_Flag_Query(474)) { @@ -139,7 +139,7 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) { if ((!Game_Flag_Query(474) && x < 120.0f) || Game_Flag_Query(474)) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 2.5f, 1.15f, 405.0f, 0, 1, false, 0)) { Game_Flag_Set(347); - Set_Enter(86, 98); + Set_Enter(86, kSceneUG14); return true; } } else if (!Game_Flag_Query(474)) { diff --git a/engines/bladerunner/script/scene/ug12.cpp b/engines/bladerunner/script/scene/ug12.cpp index 311b350588..2f560d8f65 100644 --- a/engines/bladerunner/script/scene/ug12.cpp +++ b/engines/bladerunner/script/scene/ug12.cpp @@ -84,7 +84,7 @@ bool SceneScriptUG12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(344); - Set_Enter(86, 98); + Set_Enter(86, kSceneUG14); } return true; } @@ -93,7 +93,7 @@ bool SceneScriptUG12::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(412); - Set_Enter(45, 42); + Set_Enter(45, kSceneKP02); } return true; } diff --git a/engines/bladerunner/script/scene/ug13.cpp b/engines/bladerunner/script/scene/ug13.cpp index f380f07ace..668132088d 100644 --- a/engines/bladerunner/script/scene/ug13.cpp +++ b/engines/bladerunner/script/scene/ug13.cpp @@ -156,7 +156,7 @@ bool SceneScriptUG13::ClickedOnExit(int exitId) { Player_Loses_Control(); Game_Flag_Set(430); Game_Flag_Set(431); - Set_Enter(81, 93); + Set_Enter(81, kSceneUG08); Scene_Loop_Start_Special(1, 3, 0); } return true; @@ -164,7 +164,7 @@ bool SceneScriptUG13::ClickedOnExit(int exitId) { if (exitId == 1) { if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 39.0f, 52.94f, -528.0f, 0, 1, false, 0)) { Game_Flag_Set(351); - Set_Enter(87, 99); + Set_Enter(87, kSceneUG15); } return true; } @@ -177,7 +177,7 @@ bool SceneScriptUG13::ClickedOnExit(int exitId) { if (!sub_402AD0()) { Loop_Actor_Walk_To_XYZ(kActorMcCoy, -477.0f, 141.9f, -870.0f, 0, 0, false, 0); Game_Flag_Set(434); - Set_Enter(89, 102); + Set_Enter(89, kSceneUG18); return true; } Actor_Face_Heading(kActorMcCoy, 325, false); diff --git a/engines/bladerunner/script/scene/ug14.cpp b/engines/bladerunner/script/scene/ug14.cpp index 926862da4d..8cb205856c 100644 --- a/engines/bladerunner/script/scene/ug14.cpp +++ b/engines/bladerunner/script/scene/ug14.cpp @@ -96,7 +96,7 @@ bool SceneScriptUG14::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(348); - Set_Enter(90, 103); + Set_Enter(90, kSceneUG19); } return true; } @@ -114,7 +114,7 @@ bool SceneScriptUG14::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(345); - Set_Enter(6, 96); + Set_Enter(6, kSceneUG12); } return true; } @@ -137,7 +137,7 @@ bool SceneScriptUG14::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(346); - Set_Enter(83, 95); + Set_Enter(83, kSceneUG10); } return true; } diff --git a/engines/bladerunner/script/scene/ug15.cpp b/engines/bladerunner/script/scene/ug15.cpp index 6d0ae376e5..e35121fe11 100644 --- a/engines/bladerunner/script/scene/ug15.cpp +++ b/engines/bladerunner/script/scene/ug15.cpp @@ -108,7 +108,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(352); - Set_Enter(88, 101); + Set_Enter(88, kSceneUG17); } return true; } @@ -117,7 +117,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(152); - Set_Enter(19, 100); + Set_Enter(19, kSceneUG16); } return true; } @@ -129,7 +129,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(354); - Set_Enter(19, 100); + Set_Enter(19, kSceneUG16); } return true; } @@ -138,7 +138,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(350); - Set_Enter(85, 97); + Set_Enter(85, kSceneUG13); } return true; } diff --git a/engines/bladerunner/script/scene/ug16.cpp b/engines/bladerunner/script/scene/ug16.cpp index eb1f5a0251..4b1ce4f7c5 100644 --- a/engines/bladerunner/script/scene/ug16.cpp +++ b/engines/bladerunner/script/scene/ug16.cpp @@ -133,7 +133,7 @@ bool SceneScriptUG16::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(355); - Set_Enter(87, 99); + Set_Enter(87, kSceneUG15); } return true; } @@ -142,7 +142,7 @@ bool SceneScriptUG16::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(153); - Set_Enter(87, 99); + Set_Enter(87, kSceneUG15); } return true; } @@ -153,7 +153,7 @@ bool SceneScriptUG16::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(551); - Set_Enter(36, 30); + Set_Enter(36, kSceneDR06); } return true; } diff --git a/engines/bladerunner/script/scene/ug17.cpp b/engines/bladerunner/script/scene/ug17.cpp index f0fc32d2a6..1f223b2312 100644 --- a/engines/bladerunner/script/scene/ug17.cpp +++ b/engines/bladerunner/script/scene/ug17.cpp @@ -68,7 +68,7 @@ bool SceneScriptUG17::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(353); - Set_Enter(87, 99); + Set_Enter(87, kSceneUG15); } return true; } @@ -82,7 +82,7 @@ bool SceneScriptUG17::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(448); - Set_Enter(17, 83); + Set_Enter(17, kSceneTB03); } } return true; diff --git a/engines/bladerunner/script/scene/ug18.cpp b/engines/bladerunner/script/scene/ug18.cpp index 939404dcc5..08d6269e8b 100644 --- a/engines/bladerunner/script/scene/ug18.cpp +++ b/engines/bladerunner/script/scene/ug18.cpp @@ -114,7 +114,7 @@ bool SceneScriptUG18::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(435); - Set_Enter(85, 97); + Set_Enter(85, kSceneUG13); } return true; } diff --git a/engines/bladerunner/script/scene/ug19.cpp b/engines/bladerunner/script/scene/ug19.cpp index 01ca0d18da..cee17d1223 100644 --- a/engines/bladerunner/script/scene/ug19.cpp +++ b/engines/bladerunner/script/scene/ug19.cpp @@ -92,7 +92,7 @@ bool SceneScriptUG19::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(356); - Set_Enter(53, 53); + Set_Enter(53, kSceneMA07); } return true; } @@ -101,7 +101,7 @@ bool SceneScriptUG19::ClickedOnExit(int exitId) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(349); - Set_Enter(86, 98); + Set_Enter(86, kSceneUG14); } return true; } |