diff options
Diffstat (limited to 'engines/bladerunner/script/scene/ug10.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/ug10.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/engines/bladerunner/script/scene/ug10.cpp b/engines/bladerunner/script/scene/ug10.cpp index 64e63a6a03..a33c05fbde 100644 --- a/engines/bladerunner/script/scene/ug10.cpp +++ b/engines/bladerunner/script/scene/ug10.cpp @@ -25,15 +25,15 @@ namespace BladeRunner { void SceneScriptUG10::InitializeScene() { - if (Game_Flag_Query(336)) { - Setup_Scene_Information(-92.0f, 81.33f, -652.0f, 520); + if (Game_Flag_Query(kFlagUG03toUG10)) { + Setup_Scene_Information( -92.0f, 81.33f, -652.0f, 520); } else if (Game_Flag_Query(423)) { Game_Flag_Reset(423); - Setup_Scene_Information(-385.12f, 1.15f, 57.44f, 400); - } else if (Game_Flag_Query(346)) { - Setup_Scene_Information(2.5f, 1.15f, 405.0f, 200); + Setup_Scene_Information(-385.12f, 1.15f, 57.44f, 400); + } else if (Game_Flag_Query(kFlagUG14toUG10)) { + Setup_Scene_Information( 2.5f, 1.15f, 405.0f, 200); } else { - Setup_Scene_Information(235.0f, 1.15f, 29.0f, 0); + Setup_Scene_Information( 235.0f, 1.15f, 29.0f, 0); } Scene_Exit_Add_2D_Exit(0, 589, 300, 639, 479, 1); @@ -78,7 +78,7 @@ void SceneScriptUG10::SceneLoaded() { Obstacle_Object("SLUICEGATE_LEVER", true); if (Global_Variable_Query(kVariableChapter) == 4 && !Game_Flag_Query(kFlagUG10GateOpen) - && Game_Flag_Query(kFlagDumpsterEmptied) + && Game_Flag_Query(kFlagCT04HomelessBodyThrownAway) && !Game_Flag_Query(kFlagUG03DeadHomeless) ) { Scene_Loop_Set_Default(1); @@ -114,7 +114,7 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) { ) || Game_Flag_Query(kFlagUG10GateOpen) ) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 235.0f, 1.15f, 29.0f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 235.0f, 1.15f, 29.0f, 0, true, false, 0)) { Game_Flag_Set(kFlagUG10toUG01); Set_Enter(kSetUG01, kSceneUG01); return true; @@ -128,11 +128,11 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) { ) || Game_Flag_Query(kFlagUG10GateOpen) ) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1.83f, 1.15f, -410.8f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1.83f, 1.15f, -410.8f, 0, true, false, 0)) { Actor_Face_Heading(kActorMcCoy, 0, false); Loop_Actor_Travel_Stairs(kActorMcCoy, 9, 1, kAnimationModeIdle); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -92.0f, 81.83f, -652.0f, 0, 0, false, 0); - Game_Flag_Set(337); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -92.0f, 81.83f, -652.0f, 0, false, false, 0); + Game_Flag_Set(kFlagUG10toUG03); Set_Enter(kSetUG03, kSceneUG03); return true; } @@ -145,7 +145,7 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) { ) || Game_Flag_Query(kFlagUG10GateOpen) ) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -385.0f, 1.15f, 57.44f, 0, 1, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -385.0f, 1.15f, 57.44f, 0, true, false, 0)) { Actor_Face_Heading(kActorMcCoy, 1001, false); Loop_Actor_Travel_Ladder(kActorMcCoy, 1, 1, 0); Game_Flag_Set(424); @@ -161,8 +161,8 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) { ) || Game_Flag_Query(kFlagUG10GateOpen) ) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 2.5f, 1.15f, 405.0f, 0, 1, false, 0)) { - Game_Flag_Set(347); + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 2.5f, 1.15f, 405.0f, 0, true, false, 0)) { + Game_Flag_Set(kFlagUG10toUG14); Set_Enter(kSetUG14, kSceneUG14); return true; } @@ -228,14 +228,14 @@ void SceneScriptUG10::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo } void SceneScriptUG10::PlayerWalkedIn() { - if (Game_Flag_Query(346)) { - Game_Flag_Reset(346); + if (Game_Flag_Query(kFlagUG14toUG10)) { + Game_Flag_Reset(kFlagUG14toUG10); Loop_Actor_Walk_To_XYZ(kActorMcCoy, 2.5f, 1.15f, 377.0f, 0, false, false, 0); } else if (Game_Flag_Query(kFlagUG01toUG10)) { Game_Flag_Reset(kFlagUG01toUG10); Loop_Actor_Walk_To_XYZ(kActorMcCoy, 207.0f, 1.15f, 29.0f, 0, false, false, 0); - } else if (Game_Flag_Query(336)) { - Game_Flag_Reset(336); + } else if (Game_Flag_Query(kFlagUG03toUG10)) { + Game_Flag_Reset(kFlagUG03toUG10); Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1.83f, 81.33f, -518.8f, 0, false, false, 0); Actor_Face_Heading(kActorMcCoy, 506, false); Loop_Actor_Travel_Stairs(kActorMcCoy, 9, false, kAnimationModeIdle); |