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

[OMGPizzaGuy]

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:
ddaf389f8a ULTIMA8: Adjust camera box to fix cutscene.


Commit: ddaf389f8a3ab6bd2822238d70882eef1aa57d83
    https://github.com/scummvm/scummvm/commit/ddaf389f8a3ab6bd2822238d70882eef1aa57d83
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2024-07-18T21:28:13-05:00

Commit Message:
ULTIMA8: Adjust camera box to fix cutscene.
Waking Mordea while sleeping put the camera below the floor. Increasing the box to 2x2x2 footpad fixes the cutscene and eliminates the need to increase based on main actor size.

Changed paths:
    engines/ultima/ultima8/world/camera_process.cpp


diff --git a/engines/ultima/ultima8/world/camera_process.cpp b/engines/ultima/ultima8/world/camera_process.cpp
index 11fefb1a84b..e9ff482520e 100644
--- a/engines/ultima/ultima8/world/camera_process.cpp
+++ b/engines/ultima/ultima8/world/camera_process.cpp
@@ -281,20 +281,10 @@ uint16 CameraProcess::findRoof(int32 factor) {
 	Point3 pt = GetLerped(factor);
 	_earthquake = earthquake_old;
 
-	// Default camera box based on 1x1x1 footpad,
-	// which is the minimal size to avoid floor detected as roof
-	Box target(pt.x, pt.y, pt.z, 32, 32, 8);
-
-	// Should _itemNum be used when not focused on main actor?
-	Item *item = getItem(1);
-	if (item) {
-		int32 dx, dy, dz;
-		item->getFootpadWorld(dx, dy, dz);
-		target._xd = dx;
-		target._yd = dy;
-	}
+	// Camera box based on 2x2x2 footpad to avoid floor detected as roof
+	Box target(pt.x, pt.y, pt.z, 64, 64, 16);
 
-	PositionInfo info = World::get_instance()->getCurrentMap()->getPositionInfo(target, target, 0, 1);
+	PositionInfo info = World::get_instance()->getCurrentMap()->getPositionInfo(target, target, 0, kMainActorId);
 	return info.roof ? info.roof->getObjId() : 0;
 }