From d4869218200a3dd165c2f1c156f3c1620c813241 Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Mon, 7 Mar 2016 16:43:58 -0600
Subject: SCI32: Add reg_t comparisons for graphics sorting

---
 engines/sci/graphics/screen_item32.h | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'engines/sci/graphics/screen_item32.h')

diff --git a/engines/sci/graphics/screen_item32.h b/engines/sci/graphics/screen_item32.h
index e86efdaf6a..0840570721 100644
--- a/engines/sci/graphics/screen_item32.h
+++ b/engines/sci/graphics/screen_item32.h
@@ -229,14 +229,7 @@ public:
 			}
 
 			if (_position.y + _z == other._position.y + other._z) {
-				// TODO: Failure in SQ6 room 220 when using SCI logic
-				// to compare pointer and numeric memory handles
-
-				if (_object.isNumber() && other._object.isNumber()) {
-					return _object < other._object;
-				} else if (other._object.isNumber()) {
-					return true;
-				}
+				return _object < other._object;
 			}
 		}
 
-- 
cgit v1.2.3