From 31c79b60649bc0a8559bcdb28af54ab64335b2ac Mon Sep 17 00:00:00 2001 From: Thanasis Antoniou Date: Tue, 30 Apr 2019 02:00:02 +0300 Subject: BLADERUNNER: Comments on dialogue options --- engines/bladerunner/script/ai/gordo.cpp | 4 ++-- engines/bladerunner/script/ai/izo.cpp | 28 ++++++++++++++-------------- engines/bladerunner/script/ai/zuben.cpp | 8 ++++---- engines/bladerunner/script/scene/ps09.cpp | 4 ++-- engines/bladerunner/script/scene/rc02.cpp | 4 ++-- engines/bladerunner/script/scene/rc04.cpp | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp index a6b478a4b0..87c9bdeb10 100644 --- a/engines/bladerunner/script/ai/gordo.cpp +++ b/engines/bladerunner/script/ai/gordo.cpp @@ -1673,8 +1673,8 @@ void AIScriptGordo::talkToMcCoyAtNR02() { void AIScriptGordo::dialogue2() { Music_Stop(5); Dialogue_Menu_Clear_List(); - DM_Add_To_List_Never_Repeat_Once_Selected(820, -1, 5, 7); - DM_Add_To_List_Never_Repeat_Once_Selected(830, 7, 5, -1); + DM_Add_To_List_Never_Repeat_Once_Selected(820, -1, 5, 7); // ARREST + DM_Add_To_List_Never_Repeat_Once_Selected(830, 7, 5, -1); // LET GO Dialogue_Menu_Appear(320, 240); int answer = Dialogue_Menu_Query_Input(); diff --git a/engines/bladerunner/script/ai/izo.cpp b/engines/bladerunner/script/ai/izo.cpp index d0fa07bfe0..13615d62e5 100644 --- a/engines/bladerunner/script/ai/izo.cpp +++ b/engines/bladerunner/script/ai/izo.cpp @@ -1017,32 +1017,32 @@ void AIScriptIzo::FledCombat() { void AIScriptIzo::dialogueWithIzo() { Dialogue_Menu_Clear_List(); - DM_Add_To_List_Never_Repeat_Once_Selected(0, 7, 4, -1); // MOTIVES + DM_Add_To_List_Never_Repeat_Once_Selected(0, 7, 4, -1); // MOTIVES // A bug? This is a wrong option if (Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewA)) { - DM_Add_To_List_Never_Repeat_Once_Selected(10, 8, -1, -1); // LUCY + DM_Add_To_List_Never_Repeat_Once_Selected(10, 8, -1, -1); // LUCY // A bug? This is a wrong option } - DM_Add_To_List_Never_Repeat_Once_Selected(20, 3, 7, 4); // REFERENCE - DM_Add_To_List_Never_Repeat_Once_Selected(30, -1, 3, 7); + DM_Add_To_List_Never_Repeat_Once_Selected(20, 3, 7, 4); // REFERENCE // A bug? This is a wrong option + DM_Add_To_List_Never_Repeat_Once_Selected(30, -1, 3, 7); // DONE // A bug? why not Dialogue_Menu_Add_DONE_To_List? Dialogue_Menu_Appear(320, 240); int input = Dialogue_Menu_Query_Input(); Dialogue_Menu_Disappear(); switch (input) { - case 0: // MOTIVES - Actor_Says(kActorMcCoy, 5470, 15); - Actor_Says(kActorMcCoy, 710, 13); + case 0: // MOTIVES -> Should be "LET GO"? + Actor_Says(kActorMcCoy, 5470, 15); // Get lost, Izo. Take off. + Actor_Says(kActorIzo, 710, 13); // Actor_Set_Goal_Number(kActorIzo, kGoalIzoEscape); Player_Gains_Control(); break; - case 10: // LUCY + case 10: // LUCY -> Should be split to "WEAPONS" AND "CRYSTAL" (if Replicant)? if (Game_Flag_Query(kFlagIzoIsReplicant)) { - Actor_Says(kActorMcCoy, 5475, 18); + Actor_Says(kActorMcCoy, 5475, 18); // Listen, there's another Blade Runner after you and she won't stop to talk. Actor_Says(kActorIzo, 720, 12); - Actor_Says(kActorMcCoy, 5485, 13); + Actor_Says(kActorMcCoy, 5485, 13); // Where did you get the hardware, Izo? Actor_Says(kActorIzo, 740, 14); Actor_Says(kActorMcCoy, 5495, 12); Actor_Says(kActorIzo, 750, 15); @@ -1050,10 +1050,10 @@ void AIScriptIzo::dialogueWithIzo() { Actor_Says(kActorMcCoy, 5500, 12); Actor_Says(kActorIzo, 770, 15); Actor_Says(kActorIzo, 780, 15); - Actor_Says(kActorMcCoy, 5505, 12); + Actor_Says(kActorMcCoy, 5505, 12); // I need to talk to Clovis. Actor_Says(kActorIzo, 790, 15); } else { - Actor_Says(kActorMcCoy, 5510, 15); + Actor_Says(kActorMcCoy, 5510, 15); // Where did you get the hardware, Izo? Actor_Says(kActorIzo, 820, 13); Actor_Says(kActorMcCoy, 5520, 13); Actor_Says(kActorIzo, 830, 13); @@ -1063,8 +1063,8 @@ void AIScriptIzo::dialogueWithIzo() { Player_Gains_Control(); break; - case 20: // REFERENCE - Actor_Says(kActorMcCoy, 5480, 18); + case 20: // REFERENCE -> Should be VOIGT-KAMPFF + Actor_Says(kActorMcCoy, 5480, 18); // Look, just come along with me. You’re gonna have to take a little personality test. Actor_Set_Goal_Number(kActorIzo, kGoalIzoEscape); Player_Gains_Control(); break; diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp index 9d7d76fe9d..8ead224a65 100644 --- a/engines/bladerunner/script/ai/zuben.cpp +++ b/engines/bladerunner/script/ai/zuben.cpp @@ -1234,12 +1234,12 @@ void AIScriptZuben::FledCombat() { void AIScriptZuben::dialogue() { Dialogue_Menu_Clear_List(); - DM_Add_To_List_Never_Repeat_Once_Selected(1490, 5, 5, -1); + DM_Add_To_List_Never_Repeat_Once_Selected(1490, 5, 5, -1); // CLOVIS if (Actor_Query_Goal_Number(kActorLucy) != kGoalLucyGone) { - DM_Add_To_List_Never_Repeat_Once_Selected(1500, 5, 5, 5); + DM_Add_To_List_Never_Repeat_Once_Selected(1500, 5, 5, 5); // LUCY } - DM_Add_To_List_Never_Repeat_Once_Selected(1510, -1, 5, 5); - Dialogue_Menu_Add_DONE_To_List(1520); + DM_Add_To_List_Never_Repeat_Once_Selected(1510, -1, 5, 5); // RUNCITER + Dialogue_Menu_Add_DONE_To_List(1520); // DONE Dialogue_Menu_Appear(320, 240); int answer = Dialogue_Menu_Query_Input(); Dialogue_Menu_Disappear(); diff --git a/engines/bladerunner/script/scene/ps09.cpp b/engines/bladerunner/script/scene/ps09.cpp index ad6824b858..a0a1c25713 100644 --- a/engines/bladerunner/script/scene/ps09.cpp +++ b/engines/bladerunner/script/scene/ps09.cpp @@ -296,7 +296,7 @@ void SceneScriptPS09::dialogueWithGrigorian() { || Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB1) || Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB2) ) { - DM_Add_To_List_Never_Repeat_Once_Selected(170, 5, 5, 3); // PROTEST + DM_Add_To_List_Never_Repeat_Once_Selected(170, 5, 5, 3); // PROTEST DM_Add_To_List_Never_Repeat_Once_Selected(180, -1, 5, 5); // CARS DM_Add_To_List_Never_Repeat_Once_Selected(200, -1, 3, 6); // VOIGT-KAMPFF } @@ -308,7 +308,7 @@ void SceneScriptPS09::dialogueWithGrigorian() { ) { DM_Add_To_List_Never_Repeat_Once_Selected(190, 5, 6, -1); // NOTE } - Dialogue_Menu_Add_To_List(210); // DONE + Dialogue_Menu_Add_To_List(210); // DONE // A bug? why not Dialogue_Menu_Add_DONE_To_List? Dialogue_Menu_Appear(320, 240); int answer = Dialogue_Menu_Query_Input(); diff --git a/engines/bladerunner/script/scene/rc02.cpp b/engines/bladerunner/script/scene/rc02.cpp index 65ae3e7cd9..f82b5c401a 100644 --- a/engines/bladerunner/script/scene/rc02.cpp +++ b/engines/bladerunner/script/scene/rc02.cpp @@ -146,9 +146,9 @@ void SceneScriptRC02::dialogueWithRunciter() { DM_Add_To_List_Never_Repeat_Once_Selected(20, 6, 4, 5); // REFERENCE } if (_vm->_cutContent) { - DM_Add_To_List_Never_Repeat_Once_Selected(200, -1, 3, 6); // VK - TEST + DM_Add_To_List_Never_Repeat_Once_Selected(200, -1, 3, 6); // VK - TEST } - Dialogue_Menu_Add_DONE_To_List(30); // DONE + Dialogue_Menu_Add_DONE_To_List(30); // DONE Dialogue_Menu_Appear(320, 240); int answer = Dialogue_Menu_Query_Input(); diff --git a/engines/bladerunner/script/scene/rc04.cpp b/engines/bladerunner/script/scene/rc04.cpp index 151945ce39..22379f1f7d 100644 --- a/engines/bladerunner/script/scene/rc04.cpp +++ b/engines/bladerunner/script/scene/rc04.cpp @@ -245,7 +245,7 @@ void SceneScriptRC04::dialogueWithBulletBob() { #if BLADERUNNER_ORIGINAL_BUGS Actor_Clue_Acquire(kActorMcCoy, kClueGogglesReplicantIssue, true, kActorMcCoy); // A bug? Shouldn't the last argument be -1 or kActorBulletBob here? #else - Actor_Clue_Acquire(kActorMcCoy, kClueGogglesReplicantIssue, true, kActorBulletBob); // A bug? Shouldn't the last argument be -1 or kActorBulletBob here? + Actor_Clue_Acquire(kActorMcCoy, kClueGogglesReplicantIssue, true, kActorBulletBob); #endif // BLADERUNNER_ORIGINAL_BUGS } break; -- cgit v1.2.3