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

OMGPizzaGuy noreply at scummvm.org
Sat Jan 13 23:44:49 UTC 2024


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:
f287bcddec ULTIMA8: Adjust camera box to avoid floor detected as roof during cutscenes


Commit: f287bcddecaadc0a5ee64c8261da52ed8905fc5e
    https://github.com/scummvm/scummvm/commit/f287bcddecaadc0a5ee64c8261da52ed8905fc5e
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2024-01-13T17:44:32-06:00

Commit Message:
ULTIMA8: Adjust camera box to avoid floor detected as roof during cutscenes
Fixes #14831

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 57a978430d7..c6bf49cb4f6 100644
--- a/engines/ultima/ultima8/world/camera_process.cpp
+++ b/engines/ultima/ultima8/world/camera_process.cpp
@@ -283,8 +283,10 @@ uint16 CameraProcess::findRoof(int32 factor) {
 	_earthquake = 0;
 	GetLerped(x, y, z, factor);
 	_earthquake = earthquake_old;
- 
-	Box target(x, y, z, 32, 32, 0);
+
+	// Default camera box based on 1x1x1 footpad,
+	// which is the minimal size to avoid floor detected as roof
+	Box target(x, y, z, 32, 32, 8);
 
 	// Should _itemNum be used when not focused on main actor?
 	Item *item = getItem(1);




More information about the Scummvm-git-logs mailing list