thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Colin Snover 2016-03-02 08:59:17 -06:00
parent 2e75f4b2b8
commit 7ee2af4198
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/sci/graphics/plane32.cpp
View file

@ -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));
}