[Scummvm-git-logs] scummvm branch-2-7 -> 2636f0eae13ab01c5e4eed65b1457ccec8307ac7

[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:
2636f0eae1 ULTIMA8: Fix rendering for transparent item drawn after only if locations are equal


Commit: 2636f0eae13ab01c5e4eed65b1457ccec8307ac7
    https://github.com/scummvm/scummvm/commit/2636f0eae13ab01c5e4eed65b1457ccec8307ac7
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2023-02-07T18:19:44-06:00

Commit Message:
ULTIMA8: Fix rendering for transparent item drawn after only if locations are equal

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 33071f2b241..e716f9a4860 100644
--- a/engines/ultima/ultima8/world/sort_item.h
+++ b/engines/ultima/ultima8/world/sort_item.h
@@ -370,12 +370,19 @@ inline bool SortItem::below(const SortItem &si2) const {
 	if (si1._flat != si2._flat)
 		return si1._flat > si2._flat;
 
-	// Trans always gets drawn after
-	if (si1._trans != si2._trans)
-		return si1._trans < si2._trans;
+	// Specialist handling for same location
+	if (si1._x == si2._x && si1._y == si2._y) {
+		// Trans always gets drawn after
+		if (si1._trans != si2._trans)
+			return si1._trans < si2._trans;
+	}
 
 	// Specialist z flat handling
 	if (si1._flat && si2._flat) {
+		// Trans always gets drawn after
+		if (si1._trans != si2._trans)
+			return si1._trans < si2._trans;
+
 		// Animated always gets drawn after
 		if (si1._anim != si2._anim)
 			return si1._anim < si2._anim;