aboutsummaryrefslogtreecommitdiff
path: root/engines/bladerunner
diff options
context:
space:
mode:
authorThanasis Antoniou2019-06-01 22:04:20 +0300
committerThanasis Antoniou2019-06-03 21:24:56 +0300
commit70c2d3980d08c69869c1afba96ae9a12daa125b6 (patch)
tree81a06b82f9a9acd2b7f49cdfe13ab9ba2ac15a02 /engines/bladerunner
parent091b6ebe398615032493152571a8f42a3fd3cf17 (diff)
downloadscummvm-rg350-70c2d3980d08c69869c1afba96ae9a12daa125b6.tar.gz
scummvm-rg350-70c2d3980d08c69869c1afba96ae9a12daa125b6.tar.bz2
scummvm-rg350-70c2d3980d08c69869c1afba96ae9a12daa125b6.zip
BLADERUNNER: Fix exit 0 in BB01 and remove more awry clickables
Diffstat (limited to 'engines/bladerunner')
-rw-r--r--engines/bladerunner/script/scene/bb01.cpp11
-rw-r--r--engines/bladerunner/script/scene/ct10.cpp4
-rw-r--r--engines/bladerunner/script/scene/ug09.cpp4
-rw-r--r--engines/bladerunner/script/scene/ug15.cpp4
4 files changed, 23 insertions, 0 deletions
diff --git a/engines/bladerunner/script/scene/bb01.cpp b/engines/bladerunner/script/scene/bb01.cpp
index 488022ddd7..fff17e777a 100644
--- a/engines/bladerunner/script/scene/bb01.cpp
+++ b/engines/bladerunner/script/scene/bb01.cpp
@@ -41,11 +41,22 @@ void SceneScriptBB01::InitializeScene() {
Setup_Scene_Information( 43.0f, 0.0f, 1058.0f, 0);
}
+#if BLADERUNNER_ORIGINAL_BUGS
Scene_Exit_Add_2D_Exit(0, 0, 0, 72, 299, 3);
Scene_Exit_Add_2D_Exit(1, 151, 218, 322, 290, 3);
if (Game_Flag_Query(kFlagSpinnerAtBB01)) {
Scene_Exit_Add_2D_Exit(2, 0, 311, 312, 479, 2);
}
+#else
+ // expand the left exit downwards as much as possible, especially if Spinner is missing
+ Scene_Exit_Add_2D_Exit(1, 151, 218, 322, 290, 3);
+ if (Game_Flag_Query(kFlagSpinnerAtBB01)) {
+ Scene_Exit_Add_2D_Exit(0, 0, 0, 72, 311, 3);
+ Scene_Exit_Add_2D_Exit(2, 0, 311, 312, 479, 2);
+ } else {
+ Scene_Exit_Add_2D_Exit(0, 0, 0, 72, 400, 3);
+ }
+#endif // BLADERUNNER_ORIGINAL_BUGS
Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1, 50, 0, 1);
Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 25, -100, 0);
diff --git a/engines/bladerunner/script/scene/ct10.cpp b/engines/bladerunner/script/scene/ct10.cpp
index 1b54837964..2a577bf366 100644
--- a/engines/bladerunner/script/scene/ct10.cpp
+++ b/engines/bladerunner/script/scene/ct10.cpp
@@ -57,6 +57,10 @@ void SceneScriptCT10::SceneLoaded() {
Clickable_Object("CABINETFRONT");
Clickable_Object("CABINETTOP");
Clickable_Object("TUB");
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+ Unclickable_Object("BED");
+#endif // BLADERUNNER_ORIGINAL_BUGS
Scene_2D_Region_Add(0, 379, 229, 454, 375);
}
diff --git a/engines/bladerunner/script/scene/ug09.cpp b/engines/bladerunner/script/scene/ug09.cpp
index 4bf94b74a0..d178d6ab76 100644
--- a/engines/bladerunner/script/scene/ug09.cpp
+++ b/engines/bladerunner/script/scene/ug09.cpp
@@ -82,6 +82,10 @@ void SceneScriptUG09::SceneLoaded() {
Unobstacle_Object("BOX34", true);
Unobstacle_Object("BOX32", true);
Clickable_Object("FACADE_CANOPY");
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+ Unclickable_Object("FACADE_CANOPY");
+#endif // BLADERUNNER_ORIGINAL_BUGS
}
bool SceneScriptUG09::MouseClick(int x, int y) {
diff --git a/engines/bladerunner/script/scene/ug15.cpp b/engines/bladerunner/script/scene/ug15.cpp
index 62ae01b43e..62fa14fc43 100644
--- a/engines/bladerunner/script/scene/ug15.cpp
+++ b/engines/bladerunner/script/scene/ug15.cpp
@@ -96,6 +96,10 @@ void SceneScriptUG15::SceneLoaded() {
Unobstacle_Object("LOFT01", true);
Obstacle_Object("NUT1", true);
Clickable_Object("NUT1");
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+ Unclickable_Object("NUT1");
+#endif // BLADERUNNER_ORIGINAL_BUGS
}
bool SceneScriptUG15::MouseClick(int x, int y) {