diff options
Diffstat (limited to 'engines/bladerunner/script/scene/ug10.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/ug10.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/engines/bladerunner/script/scene/ug10.cpp b/engines/bladerunner/script/scene/ug10.cpp index ba153ff36f..dfb616471f 100644 --- a/engines/bladerunner/script/scene/ug10.cpp +++ b/engines/bladerunner/script/scene/ug10.cpp @@ -99,51 +99,51 @@ bool SceneScriptUG10::ClickedOnItem(int itemId, bool a2) { bool SceneScriptUG10::ClickedOnExit(int exitId) { float x, y, z; - Actor_Query_XYZ(0, &x, &y, &z); + Actor_Query_XYZ(kActorMcCoy, &x, &y, &z); if (exitId == 0) { if ((!Game_Flag_Query(474) && x > 125.0f) || Game_Flag_Query(474)) { - if (!Loop_Actor_Walk_To_XYZ(0, 235.0f, 1.15f, 29.0f, 0, 1, false, 0)) { + 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); return true; } } else if (!Game_Flag_Query(474)) { - Actor_Says(0, 8521, 3); + Actor_Says(kActorMcCoy, 8521, 3); } } else if (exitId == 1) { if ((!Game_Flag_Query(474) && x < 120.0f) || Game_Flag_Query(474)) { - if (!Loop_Actor_Walk_To_XYZ(0, -1.83f, 1.15f, -410.8f, 0, 1, false, 0)) { - Actor_Face_Heading(0, 0, false); - Loop_Actor_Travel_Stairs(0, 9, 1, 0); - Loop_Actor_Walk_To_XYZ(0, -92.0f, 81.83f, -652.0f, 0, 0, false, 0); + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1.83f, 1.15f, -410.8f, 0, 1, false, 0)) { + Actor_Face_Heading(kActorMcCoy, 0, false); + 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); return true; } } else if (!Game_Flag_Query(474)) { - Actor_Says(0, 6165, 3); + Actor_Says(kActorMcCoy, 6165, 3); } } else if (exitId == 2) { if ((!Game_Flag_Query(474) && x < 120.0f) || Game_Flag_Query(474)) { - if (!Loop_Actor_Walk_To_XYZ(0, -385.0f, 1.15f, 57.44f, 0, 1, false, 0)) { - Actor_Face_Heading(0, 1001, false); - Loop_Actor_Travel_Ladder(0, 1, 1, 0); + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -385.0f, 1.15f, 57.44f, 0, 1, false, 0)) { + Actor_Face_Heading(kActorMcCoy, 1001, false); + Loop_Actor_Travel_Ladder(kActorMcCoy, 1, 1, 0); Game_Flag_Set(424); Set_Enter(80, 92); return true; } } else if (!Game_Flag_Query(474)) { - Actor_Says(0, 6165, 3); + Actor_Says(kActorMcCoy, 6165, 3); } } else if (exitId == 3) { if ((!Game_Flag_Query(474) && x < 120.0f) || Game_Flag_Query(474)) { - if (!Loop_Actor_Walk_To_XYZ(0, 2.5f, 1.15f, 405.0f, 0, 1, false, 0)) { + 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); return true; } } else if (!Game_Flag_Query(474)) { - Actor_Says(0, 6165, 3); + Actor_Says(kActorMcCoy, 6165, 3); } } return false; @@ -151,11 +151,11 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) { bool SceneScriptUG10::ClickedOn2DRegion(int region) { float x, y, z; - Actor_Query_XYZ(0, &x, &y, &z); + Actor_Query_XYZ(kActorMcCoy, &x, &y, &z); if (region == 0 && !Player_Query_Combat_Mode()) { if (x >= 120.0f) { - Actor_Says(0, 8525, 3); - } else if (!Loop_Actor_Walk_To_XYZ(0, 4.98f, 0.38f, 83.15f, 0, 1, false, 0)) { + Actor_Says(kActorMcCoy, 8525, 3); + } else if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 4.98f, 0.38f, 83.15f, 0, 1, false, 0)) { if (Game_Flag_Query(474)) { Scene_Loop_Set_Default(1); Scene_Loop_Start_Special(2, 0, 0); @@ -206,15 +206,15 @@ void SceneScriptUG10::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo void SceneScriptUG10::PlayerWalkedIn() { if (Game_Flag_Query(346)) { Game_Flag_Reset(346); - Loop_Actor_Walk_To_XYZ(0, 2.5f, 1.15f, 377.0f, 0, 0, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, 2.5f, 1.15f, 377.0f, 0, 0, false, 0); } else if (Game_Flag_Query(316)) { Game_Flag_Reset(316); - Loop_Actor_Walk_To_XYZ(0, 207.0f, 1.15f, 29.0f, 0, 0, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, 207.0f, 1.15f, 29.0f, 0, 0, false, 0); } else if (Game_Flag_Query(336)) { Game_Flag_Reset(336); - Loop_Actor_Walk_To_XYZ(0, -1.83f, 81.33f, -518.8f, 0, 0, false, 0); - Actor_Face_Heading(0, 506, false); - Loop_Actor_Travel_Stairs(0, 9, 0, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1.83f, 81.33f, -518.8f, 0, 0, false, 0); + Actor_Face_Heading(kActorMcCoy, 506, false); + Loop_Actor_Travel_Stairs(kActorMcCoy, 9, 0, 0); } if (Game_Flag_Query(474)) { Unobstacle_Object("BOX01 BRIDGE", true); |