[Scummvm-git-logs] scummvm master -> bf12a1ecdfcac4a6ae445d11578c71e57b370c72

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bf12a1ecdf BLADERUNNER: Fix pathfinding in PS05


Commit: bf12a1ecdfcac4a6ae445d11578c71e57b370c72
    https://github.com/scummvm/scummvm/commit/bf12a1ecdfcac4a6ae445d11578c71e57b370c72
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-03-16T14:20:35+02:00

Commit Message:
BLADERUNNER: Fix pathfinding in PS05

Changed paths:
    engines/bladerunner/script/scene/ps05.cpp
    engines/bladerunner/set.cpp


diff --git a/engines/bladerunner/script/scene/ps05.cpp b/engines/bladerunner/script/scene/ps05.cpp
index a35f9ccb788..560fbf6d798 100644
--- a/engines/bladerunner/script/scene/ps05.cpp
+++ b/engines/bladerunner/script/scene/ps05.cpp
@@ -33,7 +33,7 @@ void SceneScriptPS05::InitializeScene() {
 		Setup_Scene_Information(630.72f, 0.38f, -469.26f, 400);
 #else
 		// exiting from PS15
-		Setup_Scene_Information(553.24f, 0.37f, -422.97f, 400);
+		Setup_Scene_Information(560.24f, 0.37f, -422.97f, 400);
 #endif // BLADERUNNER_ORIGINAL_BUGS
 	}
 	Scene_Exit_Add_2D_Exit(0, 218, 98, 280, 246, 3);
@@ -148,6 +148,12 @@ bool SceneScriptPS05::ClickedOnExit(int exitId) {
 bool SceneScriptPS05::ClickedOn2DRegion(int region) {
 	if (region == 0 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 694.78f, 0.37f, -321.05f, 0, true, false, false)) {
 		Actor_Face_Heading(kActorMcCoy, 130, false);
+#if !BLADERUNNER_ORIGINAL_BUGS
+		// Add small delay so that McCoy can turn to the score board
+		// Otherwise Score board loads immediately
+		// and McCoy turns towards it after we exit the board UI
+		Delay(50);
+#endif
 		View_Score_Board();
 	}
 	return false;
diff --git a/engines/bladerunner/set.cpp b/engines/bladerunner/set.cpp
index 2003bac8358..e2986cb52d6 100644
--- a/engines/bladerunner/set.cpp
+++ b/engines/bladerunner/set.cpp
@@ -487,11 +487,11 @@ void Set::overrideSceneObjectInfo(int objectId) const {
 	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);
+			_objects[objectId].bbox.setXYZ(707.30f, 0.14f, -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
+			// 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;