[Scummvm-git-logs] scummvm master -> 1eea791ccf59c1a876d688cae9041a63ded04edb

[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:
1eea791ccf ULTIMA8: Make overlap on sort item inclusive on left/right comparison to enforce paint order checks.


Commit: 1eea791ccf59c1a876d688cae9041a63ded04edb
    https://github.com/scummvm/scummvm/commit/1eea791ccf59c1a876d688cae9041a63ded04edb
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2023-09-16T16:07:37-05:00

Commit Message:
ULTIMA8: Make overlap on sort item inclusive on left/right comparison to enforce paint order checks.

Changed paths:
    engines/ultima/ultima8/world/sort_item.h


diff --git a/engines/ultima/ultima8/world/sort_item.h b/engines/ultima/ultima8/world/sort_item.h
index 295791fc5d3..69319784344 100644
--- a/engines/ultima/ultima8/world/sort_item.h
+++ b/engines/ultima/ultima8/world/sort_item.h
@@ -336,8 +336,8 @@ inline bool SortItem::overlap(const SortItem &si2) const {
 	// 'normal' of bot right line (-2, 1) of the bounding box
 	const int32 dot_bot_right = -point_bot_diff[0] - point_bot_diff[1] * 2;
 
-	const bool right_clear = _sxRight <= si2._sxLeft;
-	const bool left_clear = _sxLeft >= si2._sxRight;
+	const bool right_clear = _sxRight < si2._sxLeft;
+	const bool left_clear = _sxLeft > si2._sxRight;
 	const bool top_left_clear = dot_top_left >= 0;
 	const bool top_right_clear = dot_top_right >= 0;
 	const bool bot_left_clear = dot_bot_left >= 0;