[Scummvm-git-logs] scummvm master -> 47ab35a76ce754a352d6c8553de7e83d195eedf5

[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:
47ab35a76c ULTIMA8: Disable Y-Flat sort rule as it was not correct at docks.


Commit: 47ab35a76ce754a352d6c8553de7e83d195eedf5
    https://github.com/scummvm/scummvm/commit/47ab35a76ce754a352d6c8553de7e83d195eedf5
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2023-09-22T22:54:41-05:00

Commit Message:
ULTIMA8: Disable Y-Flat sort rule as it was not correct at docks.
The X-Flat rule remains but likely needs reconsideration.

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 29c16c8284f..37805be17b7 100644
--- a/engines/ultima/ultima8/world/sort_item.h
+++ b/engines/ultima/ultima8/world/sort_item.h
@@ -504,14 +504,15 @@ inline bool SortItem::below(const SortItem &si2) const {
 		return xFlat1 ? xCenter1 <= xCenter2 : xCenter1 < xCenter2;
 	}
 
-	// Y-Flat gets drawn after when past center point
-	bool yFlat1 = si1._yFar == si1._y;
-	bool yFlat2 = si2._yFar == si2._y;
-	if (yFlat1 != yFlat2) {
-		int32 yCenter1 = (si1._yFar + si1._y) / 2;
-		int32 yCenter2 = (si2._yFar + si2._y) / 2;
-		return yFlat1 ? yCenter1 <= yCenter2 : yCenter1 < yCenter2;
-	}
+	// Disabled: Y-Flat gets drawn after when past center point
+	// Not correct at starting area docks
+	//bool yFlat1 = si1._yFar == si1._y;
+	//bool yFlat2 = si2._yFar == si2._y;
+	//if (yFlat1 != yFlat2) {
+	//	int32 yCenter1 = (si1._yFar + si1._y) / 2;
+	//	int32 yCenter2 = (si2._yFar + si2._y) / 2;
+	//	return yFlat1 ? yCenter1 <= yCenter2 : yCenter1 < yCenter2;
+	//}
 
 	// Partial in X + Y front
 	if (si1._x + si1._y != si2._x + si2._y)