diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/bladerunner/debugger.cpp | 6 | ||||
-rw-r--r-- | engines/bladerunner/script/scene/ct08.cpp | 8 | ||||
-rw-r--r-- | engines/bladerunner/script/scene/ct51.cpp | 5 |
3 files changed, 16 insertions, 3 deletions
diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp index 3558659dce..94464dc236 100644 --- a/engines/bladerunner/debugger.cpp +++ b/engines/bladerunner/debugger.cpp @@ -1442,7 +1442,7 @@ bool Debugger::cmdRegion(int argc, const char **argv) { if (regionTypeName == "exit") { type = atoi(argv[8]); } - Common::Rect newRect(topY, leftX, bottomY, rightX); + Common::Rect newRect(leftX, topY, rightX, bottomY); regions->add(regionID, newRect, type); debugPrintf("Adding %s: %d (t:%d l:%d b:%d r:%d) of type %d\n", regionTypeName.c_str(), regionID, newRect.top, newRect.left, newRect.bottom, newRect.right, type); return true; @@ -1470,9 +1470,9 @@ bool Debugger::cmdRegion(int argc, const char **argv) { rightX = atoi(argv[7]); if (regions->remove(regionID)) { - Common::Rect newRect(topY, leftX, bottomY, rightX); + Common::Rect newRect(leftX, topY, rightX, bottomY); regions->add(regionID, newRect, type); - debugPrintf("Bounds %s: %d (t:%d l:%d b:%d r:%d)\n", modeName.c_str(), regionID, newRect.top, newRect.left, newRect.bottom, newRect.right); + debugPrintf("Bounds %s: %d (t:%d l:%d b:%d r:%d)\n", regionTypeName.c_str(), regionID, newRect.top, newRect.left, newRect.bottom, newRect.right); } } else { // list properties diff --git a/engines/bladerunner/script/scene/ct08.cpp b/engines/bladerunner/script/scene/ct08.cpp index 053763daa3..2e41b64322 100644 --- a/engines/bladerunner/script/scene/ct08.cpp +++ b/engines/bladerunner/script/scene/ct08.cpp @@ -54,7 +54,11 @@ void SceneScriptCT08::InitializeScene() { Scene_Exit_Add_2D_Exit(2, 115, 87, 137, 267, 3); if (Game_Flag_Query(kFlagMcCoyTiedDown)) { +#if BLADERUNNER_ORIGINAL_BUGS Scene_2D_Region_Add(0, 185, 185, 230, 230); +#else + Scene_2D_Region_Add(0, 155, 180, 214, 235); +#endif // BLADERUNNER_ORIGINAL_BUGS } Ambient_Sounds_Add_Looping_Sound(kSfxRAIN10, 100, 1, 1); @@ -81,7 +85,11 @@ void SceneScriptCT08::SceneLoaded() { Obstacle_Object("ASHTRAY", true); Unobstacle_Object("BLANKET03", true); if (!Actor_Clue_Query(kActorMcCoy, kClueRagDoll)) { +#if BLADERUNNER_ORIGINAL_BUGS Item_Add_To_World(kItemRagDoll, kModelAnimationRagDoll, kSetCT08_CT51_UG12, 44.0f, 0.0f, -95.0f, 540, 12, 12, false, true, false, true); +#else + Item_Add_To_World(kItemRagDoll, kModelAnimationRagDoll, kSetCT08_CT51_UG12, 44.0f, 3.0f, -100.0f, 540, 12, 12, false, true, false, true); +#endif // BLADERUNNER_ORIGINAL_BUGS } if (!Actor_Clue_Query(kActorMcCoy, kClueCheese)) { Item_Add_To_World(kItemCheese, kModelAnimationCheese, kSetCT08_CT51_UG12, -102.0f, 2.0f, 41.0f, 432, 6, 6, false, true, false, true); diff --git a/engines/bladerunner/script/scene/ct51.cpp b/engines/bladerunner/script/scene/ct51.cpp index 98c9a9c9cb..ce8a49f2d6 100644 --- a/engines/bladerunner/script/scene/ct51.cpp +++ b/engines/bladerunner/script/scene/ct51.cpp @@ -45,7 +45,12 @@ void SceneScriptCT51::SceneLoaded() { Unobstacle_Object("BLANKET03", true); Clickable_Object("BED02"); if (!Actor_Clue_Query(kActorMcCoy, kClueRagDoll)) { +#if BLADERUNNER_ORIGINAL_BUGS Item_Add_To_World(kItemRagDoll, kModelAnimationRagDoll, kSetCT08_CT51_UG12, 44.0f, 0.0f, -95.0f, 540, 24, 24, false, true, false, true); +#else + // fix click-box overlap with clickable bed + Item_Add_To_World(kItemRagDoll, kModelAnimationRagDoll, kSetCT08_CT51_UG12, 44.0f, 3.0f, -100.0f, 540, 24, 24, false, true, false, true); +#endif } if (!Actor_Clue_Query(kActorMcCoy, kClueMoonbus1)) { Item_Add_To_World(kItemMoonbusPhoto, kModelAnimationPhoto, kSetCT08_CT51_UG12, 44.0f, 0.0f, -22.0f, 0, 12, 12, false, true, false, true); |