libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA8: Cleanup item sort dependency insertion

Browse Source
This commit is contained in:
Matthew Jimenez 2023-01-22 21:45:47 -06:00
parent 9fd47f8aba
commit 644556324a
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engines/ultima/ultima8/world/item_sorter.cpp
View File

@ -186,22 +186,22 @@ void ItemSorter::AddItem(int32 x, int32 y, int32 z, uint32 shapeNum, uint32 fram
// Attempt to find which is infront
if (si->below(*si2)) {
// si2 occludes si (us)
if (si2->_occl && si2->occludes(*si)) {
// No need to do any more checks, this isn't visible
si->_occluded = true;
break;
} else {
// si1 is behind si2, so add it to si2's dependency list
si2->_depends.insert_sorted(si);
}
// si1 is behind si2, so add it to si2's dependency list
si2->_depends.insert_sorted(si);
} else {
// ss occludes si2. Sadly, we can't remove it from the list.
if (si->_occl && si->occludes(*si2))
if (si->_occl && si->occludes(*si2)) {
// Occluded, but we can't remove it from the list
si2->_occluded = true;
// si2 is behind si1, so add it to si1's dependency list
else
si->_depends.push_back(si2);
} else {
// si2 is behind si1, so add it to si1's dependency list
si->_depends.insert_sorted(si2);
}
}
}

3
engines/ultima/ultima8/world/sort_item.h
View File

@ -212,8 +212,7 @@ struct SortItem {
}
};
//Std::vector<SortItem *> _depends; // All this Items dependencies (i.e. all objects behind)
//Std::list<SortItem *> _depends; // All this Items dependencies (i.e. all objects behind)
// All this Items dependencies (i.e. all objects behind)
DependsList _depends;
// Functions