diff options
Diffstat (limited to 'engines/bladerunner/script/scene/rc02.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/rc02.cpp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/engines/bladerunner/script/scene/rc02.cpp b/engines/bladerunner/script/scene/rc02.cpp index 9305b797f4..5200c1e6ec 100644 --- a/engines/bladerunner/script/scene/rc02.cpp +++ b/engines/bladerunner/script/scene/rc02.cpp @@ -96,8 +96,12 @@ bool SceneScriptRC02::MouseClick(int x, int y) { } bool SceneScriptRC02::ClickedOn3DObject(const char *objectName, bool a2) { - if (Object_Query_Click("SCRTY CA03", objectName) && !Actor_Clue_Query(kActorMcCoy, kClueRuncitersVideo)) { - if (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA) && Actor_Query_Is_In_Current_Set(kActorRunciter)) { + if ( Object_Query_Click("SCRTY CA03", objectName) + && !Actor_Clue_Query(kActorMcCoy, kClueRuncitersVideo) + ) { + if (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA) + && Actor_Query_Is_In_Current_Set(kActorRunciter) + ) { AI_Movement_Track_Pause(kActorRunciter); Actor_Face_Actor(kActorMcCoy, kActorRunciter, true); Actor_Says(kActorMcCoy, 4545, 14); @@ -136,7 +140,9 @@ 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); - if (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewB1) || (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewB2))) { + if (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewB1) + || Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewB2) + ) { DM_Add_To_List_Never_Repeat_Once_Selected(20, 6, 4, 5); } Dialogue_Menu_Add_DONE_To_List(30); @@ -152,7 +158,7 @@ void SceneScriptRC02::dialogueWithRunciter() { Actor_Says(kActorRunciter, 130, 19); Actor_Says(kActorMcCoy, 4605, 13); Actor_Says(kActorRunciter, 140, 16); - Game_Flag_Set(187); + Game_Flag_Set(kFlagRC02TalkedToRunciter); break; case 10: Actor_Says(kActorMcCoy, 4585, 13); @@ -248,7 +254,7 @@ bool SceneScriptRC02::ClickedOnActor(int actorId) { AI_Movement_Track_Pause(kActorRunciter); Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorRunciter, 48, 1, false); Actor_Face_Actor(kActorMcCoy, kActorRunciter, true); - if (!Game_Flag_Query(6)) { + if (!Game_Flag_Query(kFlagRunciterInterviewA)) { Actor_Says(kActorMcCoy, 4560, 13); Actor_Face_Actor(kActorRunciter, kActorMcCoy, true); Actor_Says(kActorRunciter, 40, 16); @@ -257,13 +263,13 @@ bool SceneScriptRC02::ClickedOnActor(int actorId) { Actor_Says(kActorRunciter, 60, 14); Actor_Says(kActorMcCoy, 4570, 18); Actor_Says(kActorRunciter, 70, 13); - Game_Flag_Set(6); + Game_Flag_Set(kFlagRunciterInterviewA); Actor_Clue_Acquire(kActorMcCoy, kClueRunciterInterviewA, 1, kActorRunciter); AI_Movement_Track_Unpause(kActorRunciter); return true; } - if (Game_Flag_Query(187)) { - if (Player_Query_Agenda() == 0) { + if (Game_Flag_Query(kFlagRC02TalkedToRunciter)) { + if (Player_Query_Agenda() == kPlayerAgendaPolite) { Game_Flag_Reset(0); dialogueWithRunciter(); AI_Movement_Track_Unpause(kActorRunciter); @@ -278,7 +284,7 @@ bool SceneScriptRC02::ClickedOnActor(int actorId) { Actor_Says(kActorRunciter, 170, 15); Actor_Says(kActorRunciter, 180, 13); - if (Player_Query_Agenda() == 2) { + if (Player_Query_Agenda() == kPlayerAgendaSurly) { Actor_Says(kActorMcCoy, 4620, 19); Actor_Says(kActorRunciter, 190, 14); Actor_Says(kActorMcCoy, 4625, 13); @@ -290,7 +296,7 @@ bool SceneScriptRC02::ClickedOnActor(int actorId) { Actor_Says(kActorRunciter, 240, 16); Actor_Says(kActorMcCoy, 4640, 17); } - Game_Flag_Reset(187); + Game_Flag_Reset(kFlagRC02TalkedToRunciter); AI_Movement_Track_Unpause(kActorRunciter); return true; } |