diff options
| author | Thanasis Antoniou | 2019-06-01 19:15:17 +0300 |
|---|---|---|
| committer | Thanasis Antoniou | 2019-06-01 19:16:34 +0300 |
| commit | 6a7220170e7bd5e1a7357ea5cb649863ea5f71c1 (patch) | |
| tree | edbdfb5c471c19d5c79b6a29fc3b6dbf31ac6972 /engines/bladerunner/script | |
| parent | 61800882b7003b80a198aec502ecf8e92bda90d9 (diff) | |
| download | scummvm-rg350-6a7220170e7bd5e1a7357ea5cb649863ea5f71c1.tar.gz scummvm-rg350-6a7220170e7bd5e1a7357ea5cb649863ea5f71c1.tar.bz2 scummvm-rg350-6a7220170e7bd5e1a7357ea5cb649863ea5f71c1.zip | |
BLADERUNNER: Fix paths and map glitched in NR05
McCoy should no longer teleport (occasionally) whne going to NR08
Diffstat (limited to 'engines/bladerunner/script')
| -rw-r--r-- | engines/bladerunner/script/scene/nr05.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/engines/bladerunner/script/scene/nr05.cpp b/engines/bladerunner/script/scene/nr05.cpp index b0ac1b2895..39f8aab373 100644 --- a/engines/bladerunner/script/scene/nr05.cpp +++ b/engines/bladerunner/script/scene/nr05.cpp @@ -35,7 +35,11 @@ void SceneScriptNR05::InitializeScene() { if (Game_Flag_Query(kFlagNR08toNR05)) { Scene_Loop_Start_Special(kSceneLoopModeLoseControl, kNR05LoopPanFromNR08, false); Scene_Loop_Set_Default(kNR05LoopMainLoop); +#if BLADERUNNER_ORIGINAL_BUGS Setup_Scene_Information(-777.56f, 0.0f, -166.86f, 0); +#else + Setup_Scene_Information(-752.09f, 0.0f, -193.58f, 258); +#endif // BLADERUNNER_ORIGINAL_BUGS } else if (Game_Flag_Query(kFlagNR03toNR05)) { Setup_Scene_Information( -456.0f, 0.0f, -611.0f, 0); } else { @@ -86,6 +90,10 @@ void SceneScriptNR05::InitializeScene() { void SceneScriptNR05::SceneLoaded() { Obstacle_Object("NM1-1+", true); +#if BLADERUNNER_ORIGINAL_BUGS +#else + Obstacle_Object("CUSTLFTBLOCK", true); +#endif // BLADERUNNER_ORIGINAL_BUGS Clickable_Object("NM1-1+"); Unclickable_Object("NM1-1+"); } @@ -138,10 +146,17 @@ bool SceneScriptNR05::ClickedOnExit(int exitId) { } if (exitId == 1) { +#if BLADERUNNER_ORIGINAL_BUGS if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -777.56f, 0.0f, -166.86f, 0, true, false, false)) { Game_Flag_Set(kFlagNR05toNR08); Set_Enter(kSetNR05_NR08, kSceneNR08); } +#else + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -752.09f, 0.0f, -193.58f, 0, true, false, false)) { + Game_Flag_Set(kFlagNR05toNR08); + Set_Enter(kSetNR05_NR08, kSceneNR08); + } +#endif // BLADERUNNER_ORIGINAL_BUGS return true; } return false; |