diff options
Diffstat (limited to 'engines/bladerunner/script/scene/ps07.cpp')
-rw-r--r-- | engines/bladerunner/script/scene/ps07.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engines/bladerunner/script/scene/ps07.cpp b/engines/bladerunner/script/scene/ps07.cpp index 4d15adbc54..86c8eaa5dc 100644 --- a/engines/bladerunner/script/scene/ps07.cpp +++ b/engines/bladerunner/script/scene/ps07.cpp @@ -69,11 +69,11 @@ bool SceneScriptPS07::ClickedOnActor(int actorId) { Actor_Face_Actor(kActorMcCoy, kActorKlein, true); Actor_Set_Goal_Number(kActorKlein, 3); - if (!Game_Flag_Query(kFlagKleinTalkClues)) { + if (!Game_Flag_Query(kFlagPS07KleinTalkClues)) { Actor_Says(kActorMcCoy, 4115, 13); } - if (!Game_Flag_Query(kFlagKleinTalkClues) + if (!Game_Flag_Query(kFlagPS07KleinTalkClues) && (Game_Flag_Query(kFlagMcCoyHasShellCasings) || Game_Flag_Query(kFlagMcCoyHasOfficersStatement) || Game_Flag_Query(kFlagMcCoyHasPaintTransfer) @@ -82,17 +82,17 @@ bool SceneScriptPS07::ClickedOnActor(int actorId) { ) { Actor_Face_Actor(kActorKlein, kActorMcCoy, true); Actor_Says(kActorKlein, 30, 12); - Game_Flag_Set(kFlagKleinTalkClues); + Game_Flag_Set(kFlagPS07KleinTalkClues); } else { - if (Game_Flag_Query(kFlagKleinTalkClues)) { + if (Game_Flag_Query(kFlagPS07KleinTalkClues)) { Actor_Says(kActorMcCoy, 4130, 18); } } if ( Game_Flag_Query(kFlagMcCoyHasShellCasings) - && !Game_Flag_Query(kFlagKleinTalkShellCasings) + && !Game_Flag_Query(kFlagPS07KleinTalkShellCasings) ) { - Game_Flag_Set(kFlagKleinTalkShellCasings); + Game_Flag_Set(kFlagPS07KleinTalkShellCasings); Actor_Clue_Acquire(kActorMcCoy, kClueLabShellCasings, false, kActorKlein); Actor_Says(kActorKlein, 50, 16); Actor_Says(kActorMcCoy, 4135, 13); @@ -106,9 +106,9 @@ bool SceneScriptPS07::ClickedOnActor(int actorId) { } if ( Game_Flag_Query(kFlagMcCoyHasOfficersStatement) - && !Game_Flag_Query(kFlagKleinTalkOfficersStatement) + && !Game_Flag_Query(kFlagPS07KleinTalkOfficersStatement) ) { - Game_Flag_Set(kFlagKleinTalkOfficersStatement); + Game_Flag_Set(kFlagPS07KleinTalkOfficersStatement); Actor_Clue_Acquire(kActorMcCoy, kClueLabCorpses, false, kActorKlein); Actor_Says(kActorKlein, 100, 13); Actor_Says(kActorMcCoy, 4145, 13); @@ -129,9 +129,9 @@ bool SceneScriptPS07::ClickedOnActor(int actorId) { } if ( Game_Flag_Query(kFlagMcCoyHasPaintTransfer) - && !Game_Flag_Query(kFlagKleinTalkPaintTransfer) + && !Game_Flag_Query(kFlagPS07KleinTalkPaintTransfer) ) { - Game_Flag_Set(kFlagKleinTalkPaintTransfer); + Game_Flag_Set(kFlagPS07KleinTalkPaintTransfer); Actor_Clue_Acquire(kActorMcCoy, kClueLabPaintTransfer, false, kActorKlein); Actor_Says(kActorKlein, 170, 14); Actor_Says(kActorMcCoy, 4180, 13); @@ -146,9 +146,9 @@ bool SceneScriptPS07::ClickedOnActor(int actorId) { } if ( Game_Flag_Query(kFlagMcCoyHasChromeDebris) - && !Game_Flag_Query(kFlagKleinTalkChromeDebris) + && !Game_Flag_Query(kFlagPS07KleinTalkChromeDebris) ) { - Game_Flag_Set(kFlagKleinTalkChromeDebris); + Game_Flag_Set(kFlagPS07KleinTalkChromeDebris); Actor_Says(kActorKlein, 220, 12); Actor_Says(kActorMcCoy, 4190, 13); Actor_Says(kActorKlein, 230, 14); @@ -194,7 +194,7 @@ void SceneScriptPS07::PlayerWalkedIn() { } void SceneScriptPS07::PlayerWalkedOut() { - if (!Game_Flag_Query(kFlagKleinInsulted) && Global_Variable_Query(kVariableChapter) == 1) { + if (!Game_Flag_Query(kFlagPS07KleinInsulted) && Global_Variable_Query(kVariableChapter) == 1) { Actor_Set_Goal_Number(kActorKlein, 0); } } |