diff options
| author | Colin Snover | 2016-03-07 16:43:58 -0600 |
|---|---|---|
| committer | Colin Snover | 2016-03-07 16:46:25 -0600 |
| commit | d4869218200a3dd165c2f1c156f3c1620c813241 (patch) | |
| tree | 2ce2b4a8a9df18dc0f83e29208a8492339404355 /engines/sci/graphics/screen_item32.h | |
| parent | 13f2a2c3bd889efba0009e205e3bfb811790956e (diff) | |
| download | scummvm-rg350-d4869218200a3dd165c2f1c156f3c1620c813241.tar.gz scummvm-rg350-d4869218200a3dd165c2f1c156f3c1620c813241.tar.bz2 scummvm-rg350-d4869218200a3dd165c2f1c156f3c1620c813241.zip | |
SCI32: Add reg_t comparisons for graphics sorting
Diffstat (limited to 'engines/sci/graphics/screen_item32.h')
| -rw-r--r-- | engines/sci/graphics/screen_item32.h | 9 |
1 files changed, 1 insertions, 8 deletions
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; } } |