diff options
Diffstat (limited to 'engines/bladerunner/script/scene/ct51.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/ct51.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/bladerunner/script/scene/ct51.cpp b/engines/bladerunner/script/scene/ct51.cpp index 8fb866c554..b25a8fd790 100644 --- a/engines/bladerunner/script/scene/ct51.cpp +++ b/engines/bladerunner/script/scene/ct51.cpp @@ -41,10 +41,10 @@ void SceneScriptCT51::InitializeScene() { void SceneScriptCT51::SceneLoaded() { Unobstacle_Object("BLANKET03", true); Clickable_Object("BED02"); - if (!Actor_Clue_Query(0, 85)) { + if (!Actor_Clue_Query(kActorMcCoy, kClueRagDoll)) { Item_Add_To_World(85, 943, 6, 44.0f, 0.0f, -95.0f, 540, 24, 24, false, true, false, true); } - if (!Actor_Clue_Query(0, 86)) { + if (!Actor_Clue_Query(kActorMcCoy, kClueMoonbus1)) { Item_Add_To_World(120, 984, 6, 44.0f, 0.0f, -22.0f, 0, 12, 12, false, true, false, true); } } @@ -55,13 +55,13 @@ bool SceneScriptCT51::MouseClick(int x, int y) { bool SceneScriptCT51::ClickedOn3DObject(const char *objectName, bool a2) { if (Object_Query_Click("BED02", objectName)) { - if (Actor_Clue_Query(0, 84)) { - Actor_Says(0, 8580, 12); + if (Actor_Clue_Query(kActorMcCoy, kClueHysteriaToken)) { + Actor_Says(kActorMcCoy, 8580, 12); return false; } Item_Pickup_Spin_Effect(970, 203, 200); - Actor_Clue_Acquire(0, 84, 1, -1); - Actor_Voice_Over(420, 99); + Actor_Clue_Acquire(kActorMcCoy, kClueHysteriaToken, 1, -1); + Actor_Voice_Over(420, kActorVoiceOver); return true; } return false; @@ -73,17 +73,17 @@ bool SceneScriptCT51::ClickedOnActor(int actorId) { bool SceneScriptCT51::ClickedOnItem(int itemId, bool a2) { if (itemId == 85) { - Actor_Clue_Acquire(0, 85, 1, -1); + Actor_Clue_Acquire(kActorMcCoy, kClueRagDoll, 1, -1); Item_Pickup_Spin_Effect(943, 260, 200); Ambient_Sounds_Play_Sound(563, 40, 99, 0, 0); Item_Remove_From_World(85); return true; } if (itemId == 120) { - Actor_Clue_Acquire(0, 86, 1, -1); + Actor_Clue_Acquire(kActorMcCoy, kClueMoonbus1, 1, -1); Item_Pickup_Spin_Effect(984, 490, 307); Item_Remove_From_World(120); - Actor_Says(0, 8527, 3); + Actor_Says(kActorMcCoy, 8527, 3); return true; } return false; @@ -91,8 +91,8 @@ bool SceneScriptCT51::ClickedOnItem(int itemId, bool a2) { bool SceneScriptCT51::ClickedOnExit(int exitId) { if (exitId == 1) { - if (!Loop_Actor_Walk_To_XYZ(0, 0.0f, 0.0f, -102.0f, 0, 1, false, 0)) { - Loop_Actor_Walk_To_XYZ(0, -11.0f, 0.0f, -156.0f, 0, 0, false, 0); + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 0.0f, 0.0f, -102.0f, 0, 1, false, 0)) { + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -11.0f, 0.0f, -156.0f, 0, 0, false, 0); Ambient_Sounds_Remove_All_Non_Looping_Sounds(1); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(380); @@ -118,7 +118,7 @@ void SceneScriptCT51::PlayerWalkedIn() { } void SceneScriptCT51::PlayerWalkedOut() { - if (!Actor_Clue_Query(0, 85)) { + if (!Actor_Clue_Query(kActorMcCoy, kClueRagDoll)) { Item_Remove_From_World(85); } } |