diff options
| -rw-r--r-- | engines/bladerunner/game_constants.h | 1 | ||||
| -rw-r--r-- | engines/bladerunner/script/ai/lucy.cpp | 2 | ||||
| -rw-r--r-- | engines/bladerunner/script/ai/sebastian.cpp | 2 | ||||
| -rw-r--r-- | engines/bladerunner/script/scene/hf01.cpp | 4 | ||||
| -rw-r--r-- | engines/bladerunner/script/scene/hf05.cpp | 10 | ||||
| -rw-r--r-- | engines/bladerunner/script/scene/nr01.cpp | 4 | ||||
| -rw-r--r-- | engines/bladerunner/script/scene/ps09.cpp | 4 |
7 files changed, 14 insertions, 13 deletions
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h index bc92efdc44..eb8e1e343f 100644 --- a/engines/bladerunner/game_constants.h +++ b/engines/bladerunner/game_constants.h @@ -933,6 +933,7 @@ enum Flags { kFlagMA04McCoySleeping = 647, kFlagMA04PhoneMessageFromClovis = 649, kFlagMA04PhoneMessageFromLucy = 650, + kFlagCrazylegsArrestedTalk = 652, kFlagUG02RagiationGooglesTaken = 656, kFlagDNARowAvailableTalk = 660, kFlagTB07ShadeDown = 661, // is never set diff --git a/engines/bladerunner/script/ai/lucy.cpp b/engines/bladerunner/script/ai/lucy.cpp index c35510299a..0e69ea6947 100644 --- a/engines/bladerunner/script/ai/lucy.cpp +++ b/engines/bladerunner/script/ai/lucy.cpp @@ -397,7 +397,7 @@ bool AIScriptLucy::GoalChanged(int currentGoalNumber, int newGoalNumber) { Actor_Says(kActorLucy, 360, 13); Actor_Says(kActorMcCoy, 1710, 13); - if (Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsLucy) { // how to trigger this? + if (Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsLucy) { // cut feature? if this is set lucy will not run into hf04 Actor_Says(kActorLucy, 940, 13); Actor_Says(kActorMcCoy, 6780, 12); Actor_Says(kActorLucy, 950, 12); diff --git a/engines/bladerunner/script/ai/sebastian.cpp b/engines/bladerunner/script/ai/sebastian.cpp index 4f2cc0ab80..d2560fdc74 100644 --- a/engines/bladerunner/script/ai/sebastian.cpp +++ b/engines/bladerunner/script/ai/sebastian.cpp @@ -425,7 +425,7 @@ void AIScriptSebastian::dialogue() { Actor_Says_With_Pause(kActorSebastian, 370, 0.30f, 13); Actor_Says_With_Pause(kActorSebastian, 380, 0.70f, 17); Actor_Says(kActorSebastian, 390, 14); - if (Actor_Clue_Query(kActorMcCoy, kClueChessTable)) { + if (Actor_Clue_Query(kActorMcCoy, kClueChessTable)) { // cut feature? it is impossible to obtain this clue Actor_Says(kActorMcCoy, 7140, kAnimationModeTalk); Actor_Says(kActorSebastian, 400, 12); Actor_Says(kActorMcCoy, 7145, 16); diff --git a/engines/bladerunner/script/scene/hf01.cpp b/engines/bladerunner/script/scene/hf01.cpp index 200d82b618..a469b83b66 100644 --- a/engines/bladerunner/script/scene/hf01.cpp +++ b/engines/bladerunner/script/scene/hf01.cpp @@ -366,8 +366,8 @@ void SceneScriptHF01::PlayerWalkedIn() { return; } - if (Game_Flag_Query(652)) { - Game_Flag_Reset(652); + if (Game_Flag_Query(kFlagCrazylegsArrestedTalk)) { + Game_Flag_Reset(kFlagCrazylegsArrestedTalk); Actor_Voice_Over(950, kActorVoiceOver); Actor_Voice_Over(960, kActorVoiceOver); Actor_Voice_Over(970, kActorVoiceOver); diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp index 13773f0c54..8ad33f13bd 100644 --- a/engines/bladerunner/script/scene/hf05.cpp +++ b/engines/bladerunner/script/scene/hf05.cpp @@ -372,7 +372,7 @@ void SceneScriptHF05::talkWithCrazyLegs2() { void SceneScriptHF05::dialogueWithCrazylegs1() { Dialogue_Menu_Clear_List(); - if (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote) // bug? there is no way how to obtain this clue + if (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote) // cut feature? there is no way how to obtain this clue && Global_Variable_Query(kVariableChapter) == 3 ) { DM_Add_To_List_Never_Repeat_Once_Selected(1180, 3, 6, 7); // ADVERTISEMENT @@ -388,8 +388,8 @@ void SceneScriptHF05::dialogueWithCrazylegs1() { ) { DM_Add_To_List_Never_Repeat_Once_Selected(1210, 4, 6, 2); // LUCY'S PHOTO } - if (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansResources) - || (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote) + if (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansResources) // cut feature? there is no way how to obtain this clue + || (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote) // cut feature? there is no way how to obtain this clue either && Global_Variable_Query(kVariableChapter) == 3 ) ) { @@ -518,7 +518,7 @@ void SceneScriptHF05::dialogueWithCrazylegs1() { } } -void SceneScriptHF05::dialogueWithCrazylegs2() { +void SceneScriptHF05::dialogueWithCrazylegs2() { // cut feature? it is impossible to trigger this dialog Dialogue_Menu_Clear_List(); DM_Add_To_List_Never_Repeat_Once_Selected(1250, -1, -1, 10); // ARREST DM_Add_To_List_Never_Repeat_Once_Selected(1260, 10, 5, -1); // WARNING @@ -543,7 +543,7 @@ void SceneScriptHF05::dialogueWithCrazylegs2() { Actor_Put_In_Set(kActorCrazylegs, kSetPS09); Actor_Set_At_XYZ(kActorCrazylegs, -315.15f, 0.0f, 241.06f, 583); Actor_Set_Goal_Number(kActorCrazylegs, 699); - Game_Flag_Set(652); + Game_Flag_Set(kFlagCrazylegsArrestedTalk); if (Game_Flag_Query(kFlagSpinnerAtNR01)) { Set_Enter(kSetNR01, kSceneNR01); } else { diff --git a/engines/bladerunner/script/scene/nr01.cpp b/engines/bladerunner/script/scene/nr01.cpp index 611a18a930..c91fdb43a9 100644 --- a/engines/bladerunner/script/scene/nr01.cpp +++ b/engines/bladerunner/script/scene/nr01.cpp @@ -410,8 +410,8 @@ void SceneScriptNR01::PlayerWalkedIn() { } } - if (Game_Flag_Query(652)) { - Game_Flag_Reset(652); + if (Game_Flag_Query(kFlagCrazylegsArrestedTalk)) { + Game_Flag_Reset(kFlagCrazylegsArrestedTalk); Actor_Voice_Over(950, kActorVoiceOver); Actor_Voice_Over(960, kActorVoiceOver); Actor_Voice_Over(970, kActorVoiceOver); diff --git a/engines/bladerunner/script/scene/ps09.cpp b/engines/bladerunner/script/scene/ps09.cpp index 02aa88e93d..d7f48b0f1f 100644 --- a/engines/bladerunner/script/scene/ps09.cpp +++ b/engines/bladerunner/script/scene/ps09.cpp @@ -54,7 +54,7 @@ void SceneScriptPS09::InitializeScene() { Actor_Put_In_Set(kActorIzo, kSetPS09); Actor_Set_At_XYZ(kActorIzo, -476.0f, 0.2f, -225.0f, 518); } - if (Game_Flag_Query(kFlagCrazylegsArrested)) { + if (Game_Flag_Query(kFlagCrazylegsArrested)) { // cut feature? it is impossible to arrest crazylegs Actor_Put_In_Set(kActorCrazylegs, kSetPS09); Actor_Set_At_XYZ(kActorCrazylegs, -290.0f, 0.33f, -235.0f, 207); } @@ -300,7 +300,7 @@ void SceneScriptPS09::dialogueWithGrigorian() { 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 } - if (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote) // bug? there is no way how to obtain this clue + if (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote) // cut feature? it is impossible to obtain this clue && (Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewA) || Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB1) || Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB2) |