aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Snover2016-03-02 08:59:17 -0600
committerColin Snover2016-03-02 08:59:17 -0600
commit7ee2af41984500ac580a904a15be498e625cf5c3 (patch)
treeb84e2c3cad7335ecd0a77f20e059db710e2d0f74
parent2e75f4b2b898866ffeafca5c69709dd3e358dcb5 (diff)
downloadscummvm-rg350-7ee2af41984500ac580a904a15be498e625cf5c3.tar.gz
scummvm-rg350-7ee2af41984500ac580a904a15be498e625cf5c3.tar.bz2
scummvm-rg350-7ee2af41984500ac580a904a15be498e625cf5c3.zip
SCI32: Fix changed screen items drawing on top of higher screen items
-rw-r--r--engines/sci/graphics/plane32.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/graphics/plane32.cpp b/engines/sci/graphics/plane32.cpp
index 5ae3ed979d..52dde4b465 100644
--- a/engines/sci/graphics/plane32.cpp
+++ b/engines/sci/graphics/plane32.cpp
@@ -434,7 +434,7 @@ void Plane::calcLists(Plane &visiblePlane, const PlaneList &planeList, DrawList
}
}
}
- if (/* TODO: g_Remap_numActiveRemaps */ false) { // no remaps active?
+ if (/* TODO: g_Remap_numActiveRemaps == 0 */ true) { // no remaps active?
// Add all items that overlap with items in the drawlist and have higher
// priority
for (DrawList::size_type i = 0; i < drawList.size(); ++i) {
@@ -447,7 +447,7 @@ void Plane::calcLists(Plane &visiblePlane, const PlaneList &planeList, DrawList
if (j < _screenItemList.size() && sli) {
if (!sli->_updated && !sli->_deleted && !sli->_created) {
ScreenItem *item = dli->screenItem;
- if (sli->_priority > item->_priority || (sli->_priority == item->_priority && sli->_object > item->_object)) {
+ if (sli->_priority > item->_priority /* TODO: || (sli->_priority == item->_priority && sli->_object > item->_object)*/) {
if (dli->rect.intersects(sli->_screenRect)) {
drawList.add(sli, dli->rect.findIntersectingRect(sli->_screenRect));
}