[Scummvm-git-logs] scummvm master -> 2a38562d4bc968bb9d32a9bbe5e57f9d37f88a60
antoniou79
antoniou at cti.gr
Sat May 4 22:46:18 CEST 2019
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d5b4f6bf4b BLADERUNNER: Fix clickbox for chess and boiler BB51
8863b23ee1 BLADERUNNER: Fix clickbox basket, fire ext PS05
2a38562d4b BLADERUNNER: CT08 CT51 doll box fix and radiator region
Commit: d5b4f6bf4bd3a6f05a3e9e6de413f599068fa6fc
https://github.com/scummvm/scummvm/commit/d5b4f6bf4bd3a6f05a3e9e6de413f599068fa6fc
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-05-04T21:45:27+03:00
Commit Message:
BLADERUNNER: Fix clickbox for chess and boiler BB51
Changed paths:
engines/bladerunner/set.cpp
diff --git a/engines/bladerunner/set.cpp b/engines/bladerunner/set.cpp
index 6d898bd..4540219 100644
--- a/engines/bladerunner/set.cpp
+++ b/engines/bladerunner/set.cpp
@@ -434,10 +434,20 @@ void Set::overrideSceneObjectInfo(int objectId) const {
_objects[objectId].bbox.setXYZ(-161.47f, 30.0f, 53.75f, -110.53f, 69.81f, 90.90f);
}
break;
+ case kSceneBB51:
+ // Sebastian's room with chess and egg boiler
+ if (objectId == 0 && _objects[objectId].name == "V2CHESSTBL01") {
+ // Chess
+ _objects[objectId].bbox.setXYZ(114.55f, 20.83f, -67.91f, 153.58f, 28.14f, -29.16f);
+ } else if (objectId == 1 && _objects[objectId].name == "TOP02") {
+ // egg boiler
+ _objects[objectId].bbox.setXYZ(60.00f, 16.00f, -141.21f, 91.60f, 39.94f, -116.00f);
+ }
+ break;
case kSceneUG09:
// block passage to buggy pipe
if (objectId == 7 && _objects[objectId].name == "BOXS FOR ARCHWAY 01") {
- _objects[objectId].bbox.setXYZ(-168.99f, 151.38f, -139.10f, -105.95f, 239.59f, 362.70);
+ _objects[objectId].bbox.setXYZ(-168.99f, 151.38f, -139.10f, -105.95f, 239.59f, 362.70f);
}
break;
default:
Commit: 8863b23ee192a84e59b45140b8f6544455f4a1c1
https://github.com/scummvm/scummvm/commit/8863b23ee192a84e59b45140b8f6544455f4a1c1
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-05-04T22:35:56+03:00
Commit Message:
BLADERUNNER: Fix clickbox basket, fire ext PS05
Changed paths:
engines/bladerunner/set.cpp
diff --git a/engines/bladerunner/set.cpp b/engines/bladerunner/set.cpp
index 4540219..e03466b 100644
--- a/engines/bladerunner/set.cpp
+++ b/engines/bladerunner/set.cpp
@@ -444,6 +444,17 @@ void Set::overrideSceneObjectInfo(int objectId) const {
_objects[objectId].bbox.setXYZ(60.00f, 16.00f, -141.21f, 91.60f, 39.94f, -116.00f);
}
break;
+ case kScenePS05:
+ if (objectId == 8 && _objects[objectId].name == "WIRE BASKET") {
+ // waste basket click box
+ _objects[objectId].bbox.setXYZ(706.32f, 0.0f, -350.80f, 724.90f, 15.15f, -330.09f);
+ } else if (objectId == 0 && _objects[objectId].name == "FIRE EXTINGISHER") {
+ // fire extinguisher is click-able (original game) but does nothing
+ // still it's best to fix its clickbox and remove clickable or restore functionality from
+ // the scene script
+ _objects[objectId].bbox.setXYZ(695.63f, 42.65f, -628.10f, 706.71f, 69.22f, -614.47f);
+ }
+ break;
case kSceneUG09:
// block passage to buggy pipe
if (objectId == 7 && _objects[objectId].name == "BOXS FOR ARCHWAY 01") {
Commit: 2a38562d4bc968bb9d32a9bbe5e57f9d37f88a60
https://github.com/scummvm/scummvm/commit/2a38562d4bc968bb9d32a9bbe5e57f9d37f88a60
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-05-04T23:44:30+03:00
Commit Message:
BLADERUNNER: CT08 CT51 doll box fix and radiator region
Also a smalle fix for debugger (adding new region or adjusting its rectangle)
Changed paths:
engines/bladerunner/debugger.cpp
engines/bladerunner/script/scene/ct08.cpp
engines/bladerunner/script/scene/ct51.cpp
diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index 3558659..94464dc 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 053763d..2e41b64 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 98c9a9c..ce8a49f 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);
More information about the Scummvm-git-logs
mailing list