diff options
author | Thanasis Antoniou | 2019-05-13 22:29:26 +0300 |
---|---|---|
committer | Thanasis Antoniou | 2019-05-13 22:29:26 +0300 |
commit | 093c18564c1c2b973acddb328525e2dc0bd12f64 (patch) | |
tree | 76a7edd5cb5f34ef0179de82c0ffead68560ed2f /engines/bladerunner/script/scene | |
parent | a14dffbf4b8c7ba51e4c801cc49584dc974864dc (diff) | |
download | scummvm-rg350-093c18564c1c2b973acddb328525e2dc0bd12f64.tar.gz scummvm-rg350-093c18564c1c2b973acddb328525e2dc0bd12f64.tar.bz2 scummvm-rg350-093c18564c1c2b973acddb328525e2dc0bd12f64.zip |
BLADERUNNER: Act 4 meet with Rachael polish
Diffstat (limited to 'engines/bladerunner/script/scene')
-rw-r--r-- | engines/bladerunner/script/scene/ma06.cpp | 7 | ||||
-rw-r--r-- | engines/bladerunner/script/scene/ug04.cpp | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/engines/bladerunner/script/scene/ma06.cpp b/engines/bladerunner/script/scene/ma06.cpp index 380c6ad7bb..7155beda1e 100644 --- a/engines/bladerunner/script/scene/ma06.cpp +++ b/engines/bladerunner/script/scene/ma06.cpp @@ -158,6 +158,9 @@ void SceneScriptMA06::PlayerWalkedIn() { Actor_Set_Goal_Number(kActorRachael, kGoalRachaelIsInsideElevatorStartTalkAct4); // Delay(500); + Game_Flag_Reset(kFlagMA01toMA06); + Game_Flag_Reset(kFlagMA02toMA06); + Game_Flag_Reset(kFlagMA07toMA06); Ambient_Sounds_Adjust_Looping_Sound(kSfxSPINUP1, 0, 0, 1); Ambient_Sounds_Adjust_Looping_Sound(kSfxAPRTFAN1, 0, 0, 1); Ambient_Sounds_Adjust_Looping_Sound(kSfxELEAMB3, 0, 0, 1); @@ -165,10 +168,6 @@ void SceneScriptMA06::PlayerWalkedIn() { Ambient_Sounds_Remove_Looping_Sound(kSfxAPRTFAN1, 1); // stop other ambient Ambient_Sounds_Remove_Looping_Sound(kSfxELEAMB3, 1); // stop other ambient - Game_Flag_Reset(kFlagMA01toMA06); - Game_Flag_Reset(kFlagMA02toMA06); - Game_Flag_Reset(kFlagMA07toMA06); - // Player_Gains_Control(); Set_Enter(kSetMA07, kSceneMA07); Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kMA06LoopDoorClose, true); diff --git a/engines/bladerunner/script/scene/ug04.cpp b/engines/bladerunner/script/scene/ug04.cpp index 766f0b9457..a0db3143fb 100644 --- a/engines/bladerunner/script/scene/ug04.cpp +++ b/engines/bladerunner/script/scene/ug04.cpp @@ -74,7 +74,11 @@ void SceneScriptUG04::InitializeScene() { } void SceneScriptUG04::SceneLoaded() { - Obstacle_Object("NAV", true); +#if BLADERUNNER_ORIGINAL_BUGS + Obstacle_Object("NAV", true); // a bug? this object does not exist in the scene +#else + Obstacle_Object("VAN", true); +#endif // BLADERUNNER_ORIGINAL_BUGS Unobstacle_Object("RUBBLE", true); Unobstacle_Object("FLOOR DEBRIS WADS", true); Unobstacle_Object("FLOOR DEBRIS WADS01", true); |