diff options
Diffstat (limited to 'engines/bladerunner/script/scene/kp06.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/kp06.cpp | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/engines/bladerunner/script/scene/kp06.cpp b/engines/bladerunner/script/scene/kp06.cpp index a56080af23..e9fab6dae9 100644 --- a/engines/bladerunner/script/scene/kp06.cpp +++ b/engines/bladerunner/script/scene/kp06.cpp @@ -73,19 +73,19 @@ bool SceneScriptKP06::ClickedOn3DObject(const char *objectName, bool a2) { bool SceneScriptKP06::ClickedOnActor(int actorId) { if (actorId == 8 && !Game_Flag_Query(714)) { - if (Actor_Clue_Query(8, 145)) { - Actor_Face_Actor(0, 8, true); - Actor_Says(0, 8610, 15); - Actor_Says(8, 290, 3); - } else if (Actor_Clue_Query(0, 145) ) { - Actor_Says(8, 280, 3); - Actor_Says(8, 290, 3); - Actor_Clue_Acquire(8, 145, 1, 0); + if (Actor_Clue_Query(kActorSadik, kCluePowerSource)) { + Actor_Face_Actor(kActorMcCoy, kActorSadik, true); + Actor_Says(kActorMcCoy, 8610, 15); + Actor_Says(kActorSadik, 290, 3); + } else if (Actor_Clue_Query(kActorMcCoy, kCluePowerSource) ) { + Actor_Says(kActorSadik, 280, 3); + Actor_Says(kActorSadik, 290, 3); + Actor_Clue_Acquire(kActorSadik, kCluePowerSource, 1, kActorMcCoy); } else { - Actor_Says(0, 2320, 3); - Actor_Says(0, 2325, 3); - Actor_Says(8, 300, 3); - Actor_Says(8, 310, 3); + Actor_Says(kActorMcCoy, 2320, 3); + Actor_Says(kActorMcCoy, 2325, 3); + Actor_Says(kActorSadik, 300, 3); + Actor_Says(kActorSadik, 310, 3); } } return false; @@ -97,7 +97,7 @@ bool SceneScriptKP06::ClickedOnItem(int itemId, bool a2) { bool SceneScriptKP06::ClickedOnExit(int exitId) { if (exitId == 0) { - if (!Loop_Actor_Walk_To_XYZ(0, -868.0f, 8.26f, -68.0f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -868.0f, 8.26f, -68.0f, 0, 1, false, 0)) { Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(577); @@ -106,34 +106,34 @@ bool SceneScriptKP06::ClickedOnExit(int exitId) { return true; } if (exitId == 1) { - if (Actor_Clue_Query(8, 145) || Actor_Query_Goal_Number(8) != 416) { - if (!Loop_Actor_Walk_To_XYZ(0, -731.0f, 8.26f, -657.0f, 0, 1, false, 0)) { + if (Actor_Clue_Query(kActorSadik, kCluePowerSource) || Actor_Query_Goal_Number(kActorSadik) != 416) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -731.0f, 8.26f, -657.0f, 0, 1, false, 0)) { if (Game_Flag_Query(653)) { if (!Game_Flag_Query(714)) { Player_Set_Combat_Mode(false); } - } else if (Actor_Query_Goal_Number(1) == 433) { - Actor_Set_Goal_Number(1, 499); + } else if (Actor_Query_Goal_Number(kActorSteele) == 433) { + Actor_Set_Goal_Number(kActorSteele, 499); } else { - Actor_Set_Goal_Number(53, 499); + Actor_Set_Goal_Number(kActorGaff, 499); } Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(578); Set_Enter(48, 47); } - } else if (Actor_Clue_Query(0, 145) ) { - Actor_Says(8, 280, 3); - Actor_Says(8, 290, 3); - Actor_Clue_Acquire(8, 145, 1, 0); - Loop_Actor_Walk_To_XYZ(0, -731.0f, 8.26f, -657.0f, 0, 0, true, 0); + } else if (Actor_Clue_Query(kActorMcCoy, kCluePowerSource) ) { + Actor_Says(kActorSadik, 280, 3); + Actor_Says(kActorSadik, 290, 3); + Actor_Clue_Acquire(kActorSadik, kCluePowerSource, 1, kActorMcCoy); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -731.0f, 8.26f, -657.0f, 0, 0, true, 0); Player_Set_Combat_Mode(false); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(578); Set_Enter(48, 47); } else { - Actor_Set_Goal_Number(8, 417); + Actor_Set_Goal_Number(kActorSadik, 417); } return true; } @@ -153,25 +153,25 @@ void SceneScriptKP06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo void SceneScriptKP06::PlayerWalkedIn() { if (!Game_Flag_Query(653) && Game_Flag_Query(579)) { Game_Flag_Reset(579); - if (Actor_Query_Goal_Number(1) == 499) { - Actor_Face_Actor(1, 0, true); - Actor_Says(1, 2530, 13); - Actor_Face_Actor(0, 1, true); - Actor_Says(0, 6200, 11); - Actor_Says(1, 2540, 15); - Actor_Says(1, 2550, 12); - Actor_Says(0, 6205, 14); - if (Actor_Query_Friendliness_To_Other(1, 0) < 50) { - Actor_Says(1, 2560, 12); - Actor_Says(0, 6210, 14); - Actor_Says(1, 2570, 13); - Actor_Says(0, 6215, 14); - Actor_Says(1, 2580, 15); - Actor_Says(1, 2590, 12); + if (Actor_Query_Goal_Number(kActorSteele) == 499) { + Actor_Face_Actor(kActorSteele, kActorMcCoy, true); + Actor_Says(kActorSteele, 2530, 13); + Actor_Face_Actor(kActorMcCoy, kActorSteele, true); + Actor_Says(kActorMcCoy, 6200, 11); + Actor_Says(kActorSteele, 2540, 15); + Actor_Says(kActorSteele, 2550, 12); + Actor_Says(kActorMcCoy, 6205, 14); + if (Actor_Query_Friendliness_To_Other(kActorSteele, kActorMcCoy) < 50) { + Actor_Says(kActorSteele, 2560, 12); + Actor_Says(kActorMcCoy, 6210, 14); + Actor_Says(kActorSteele, 2570, 13); + Actor_Says(kActorMcCoy, 6215, 14); + Actor_Says(kActorSteele, 2580, 15); + Actor_Says(kActorSteele, 2590, 12); } - Async_Actor_Walk_To_Waypoint(0, 551, 0, 0); + Async_Actor_Walk_To_Waypoint(kActorMcCoy, 551, 0, 0); Delay(1000); - Actor_Says(0, 6220, -1); + Actor_Says(kActorMcCoy, 6220, -1); Delay(3000); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); @@ -180,31 +180,31 @@ void SceneScriptKP06::PlayerWalkedIn() { //return true; return; } else { - Actor_Set_Goal_Number(53, 499); - Actor_Face_Actor(53, 0, true); - Actor_Says(53, 220, 13); - Actor_Face_Actor(0, 53, true); - Actor_Says(0, 6245, 11); - Actor_Says(53, 230, 14); + Actor_Set_Goal_Number(kActorGaff, 499); + Actor_Face_Actor(kActorGaff, kActorMcCoy, true); + Actor_Says(kActorGaff, 220, 13); + Actor_Face_Actor(kActorMcCoy, kActorGaff, true); + Actor_Says(kActorMcCoy, 6245, 11); + Actor_Says(kActorGaff, 230, 14); if (Game_Flag_Query(714)) { - Actor_Says(0, 6250, 15); - Actor_Says(53, 240, 13); + Actor_Says(kActorMcCoy, 6250, 15); + Actor_Says(kActorGaff, 240, 13); Delay(1000); - Actor_Says(0, 6255, 17); - Actor_Says(53, 250, 14); + Actor_Says(kActorMcCoy, 6255, 17); + Actor_Says(kActorGaff, 250, 14); Delay(1000); } - Actor_Says(53, 260, 12); - Actor_Says(0, 6260, 15); - Actor_Says(53, 270, 13); - Actor_Says(53, 280, 15); - Actor_Says(0, 6265, 14); - Actor_Says(53, 290, 14); - Actor_Says(53, 300, 15); - Actor_Says(0, 6270, 11); - Async_Actor_Walk_To_Waypoint(0, 550, 0, 0); - Async_Actor_Walk_To_Waypoint(53, 551, 0, 0); - Actor_Says(53, 310, -1); + Actor_Says(kActorGaff, 260, 12); + Actor_Says(kActorMcCoy, 6260, 15); + Actor_Says(kActorGaff, 270, 13); + Actor_Says(kActorGaff, 280, 15); + Actor_Says(kActorMcCoy, 6265, 14); + Actor_Says(kActorGaff, 290, 14); + Actor_Says(kActorGaff, 300, 15); + Actor_Says(kActorMcCoy, 6270, 11); + Async_Actor_Walk_To_Waypoint(kActorMcCoy, 550, 0, 0); + Async_Actor_Walk_To_Waypoint(kActorGaff, 551, 0, 0); + Actor_Says(kActorGaff, 310, -1); Delay(3000); Outtake_Play(26, 0, -1); Game_Over(); @@ -212,13 +212,13 @@ void SceneScriptKP06::PlayerWalkedIn() { return; } } else { - if (Actor_Query_Goal_Number(8) == 414) { - Loop_Actor_Walk_To_XYZ(0, -809.0f, 8.26f, -619.0f, 0, 0, false, 0); - Actor_Face_Actor(0, 8, true); - Actor_Set_Goal_Number(8, 415); + if (Actor_Query_Goal_Number(kActorSadik) == 414) { + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -809.0f, 8.26f, -619.0f, 0, 0, false, 0); + Actor_Face_Actor(kActorMcCoy, kActorSadik, true); + Actor_Set_Goal_Number(kActorSadik, 415); } - if (Actor_Query_Goal_Number(1) == 431) { - Actor_Set_Goal_Number(1, 432); + if (Actor_Query_Goal_Number(kActorSteele) == 431) { + Actor_Set_Goal_Number(kActorSteele, 432); } //return false; return; @@ -226,8 +226,8 @@ void SceneScriptKP06::PlayerWalkedIn() { } void SceneScriptKP06::PlayerWalkedOut() { - if (Game_Flag_Query(578) && Actor_Query_Goal_Number(1) == 433) { - Actor_Set_Goal_Number(1, 499); + if (Game_Flag_Query(578) && Actor_Query_Goal_Number(kActorSteele) == 433) { + Actor_Set_Goal_Number(kActorSteele, 499); } } |