aboutsummaryrefslogtreecommitdiff
path: root/engines/bladerunner/script/scene/hf01.cpp
diff options
context:
space:
mode:
authorPeter Kohaut2019-02-07 23:44:37 +0100
committerPeter Kohaut2019-02-07 23:45:41 +0100
commit7061f7cb173871e84d26010b9742fcec8a0ece1a (patch)
treee830affbe2be948917848e7d0d22ca85305cc35d /engines/bladerunner/script/scene/hf01.cpp
parentb3b6f6eaa36ef8651d3a7192f07223699b7055a9 (diff)
downloadscummvm-rg350-7061f7cb173871e84d26010b9742fcec8a0ece1a.tar.gz
scummvm-rg350-7061f7cb173871e84d26010b9742fcec8a0ece1a.tar.bz2
scummvm-rg350-7061f7cb173871e84d26010b9742fcec8a0ece1a.zip
BLADERUNNER: Cleanup for drive away endings scripts
All ending are achievable
Diffstat (limited to 'engines/bladerunner/script/scene/hf01.cpp')
-rw-r--r--engines/bladerunner/script/scene/hf01.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/bladerunner/script/scene/hf01.cpp b/engines/bladerunner/script/scene/hf01.cpp
index 2ceda569c1..9f871c474c 100644
--- a/engines/bladerunner/script/scene/hf01.cpp
+++ b/engines/bladerunner/script/scene/hf01.cpp
@@ -46,7 +46,7 @@ void SceneScriptHF01::InitializeScene() {
}
Scene_Exit_Add_2D_Exit(0, 81, 226, 169, 321, 0);
- if (!Game_Flag_Query(663)) {
+ if (!Game_Flag_Query(kFlagHF05PoliceArrived)) {
Scene_Exit_Add_2D_Exit(1, 304, 239, 492, 339, 0);
Scene_Exit_Add_2D_Exit(2, 560, 231, 639, 360, 0);
if (Game_Flag_Query(kFlagSpinnerAtHF01)) {
@@ -80,7 +80,7 @@ void SceneScriptHF01::InitializeScene() {
Scene_Loop_Start_Special(kSceneLoopModeLoseControl, kHF01LoopInshot, false);
}
Scene_Loop_Set_Default(kHF01LoopMainLoopSpinner);
- } else if (Game_Flag_Query(663)) {
+ } else if (Game_Flag_Query(kFlagHF05PoliceArrived)) {
Scene_Loop_Set_Default(kHF01LoopMainLoopSpinner);
} else {
Scene_Loop_Set_Default(kHF01LoopMainLoopNoSpinner);
@@ -159,9 +159,9 @@ bool SceneScriptHF01::ClickedOnActor(int actorId) {
&& !Game_Flag_Query(kFlagCrazylegsArrested)
&& Actor_Query_Goal_Number(kActorCrazylegs) != 2
&& Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)
- && !Game_Flag_Query(662)
+ && !Game_Flag_Query(kFlagHF01TalkToLovedOne)
) {
- Game_Flag_Set(662);
+ Game_Flag_Set(kFlagHF01TalkToLovedOne);
Actor_Face_Actor(kActorMcCoy, affectionTowardsActor, true);
Actor_Face_Actor(affectionTowardsActor, kActorMcCoy, true);
if (affectionTowardsActor == kActorDektora) {
@@ -328,7 +328,7 @@ void SceneScriptHF01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
}
void SceneScriptHF01::PlayerWalkedIn() {
- if (Game_Flag_Query(663)) {
+ if (Game_Flag_Query(kFlagHF05PoliceArrived)) {
ADQ_Flush();
ADQ_Add(kActorOfficerGrayford, 280, kAnimationModeTalk);
Actor_Put_In_Set(kActorOfficerLeary, kSetHF01);
@@ -340,7 +340,7 @@ void SceneScriptHF01::PlayerWalkedIn() {
}
if (!Game_Flag_Query(kFlagCrazylegsArrested)
- && Actor_Query_Goal_Number(kActorCrazylegs) != 2
+ && Actor_Query_Goal_Number(kActorCrazylegs) != 2
) {
if (Actor_Clue_Query(kActorMcCoy, kCluePhoneCallLucy1)
&& Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsLucy