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

[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:
a178a6771e ULTIMA8: Fix #14031 - ignore transparent non-solids when tracing items.


Commit: a178a6771ef972db85c657f1e611890f647787f7
    https://github.com/scummvm/scummvm/commit/a178a6771ef972db85c657f1e611890f647787f7
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2023-02-10T17:31:47-06:00

Commit Message:
ULTIMA8: Fix #14031 - ignore transparent non-solids when tracing items.

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


diff --git a/engines/ultima/ultima8/world/item_sorter.cpp b/engines/ultima/ultima8/world/item_sorter.cpp
index fe2d570cef2..fc17b05a2ce 100644
--- a/engines/ultima/ultima8/world/item_sorter.cpp
+++ b/engines/ultima/ultima8/world/item_sorter.cpp
@@ -385,6 +385,10 @@ uint16 ItemSorter::Trace(int32 x, int32 y, HitFace *face, bool item_highlight) {
 				if (!it->_itemNum || !it->contains(x, y))
 					continue;
 
+				// Skip transparent non-solids
+				if (!it->_solid && it->_trans)
+					continue;
+
 				// Now check the _frame itself
 				const ShapeFrame *_frame = it->_shape->getFrame(it->_frame);
 				assert(_frame); // invalid frames shouldn't have been added to the list
@@ -412,6 +416,10 @@ uint16 ItemSorter::Trace(int32 x, int32 y, HitFace *face, bool item_highlight) {
 			if (!it->_itemNum || !it->contains(x, y))
 				continue;
 
+			// Skip transparent non-solids
+			if (!it->_solid && it->_trans)
+				continue;
+
 			// Now check the _frame itself
 			const ShapeFrame *_frame = it->_shape->getFrame(it->_frame);
 			assert(_frame); // invalid frames shouldn't have been added to the list