[Scummvm-cvs-logs] scummvm master -> 7ee2af41984500ac580a904a15be498e625cf5c3

[csnover]

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:
7ee2af4198 SCI32: Fix changed screen items drawing on top of higher screen items


Commit: 7ee2af41984500ac580a904a15be498e625cf5c3
    https://github.com/scummvm/scummvm/commit/7ee2af41984500ac580a904a15be498e625cf5c3
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-03-02T08:59:17-06:00

Commit Message:
SCI32: Fix changed screen items drawing on top of higher screen items

Changed paths:
    engines/sci/graphics/plane32.cpp



diff --git a/engines/sci/graphics/plane32.cpp b/engines/sci/graphics/plane32.cpp
index 5ae3ed9..52dde4b 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));
 								}