mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 13:03:11 +01:00
Code Issues Releases Wiki Activity

Take kAllObjectTypes internal as well

Browse Source
This commit is contained in:
Aaron van Geffen
2024-03-27 21:26:07 +01:00
parent e898e9211d
commit cec251bb63
5 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/object/ObjectManager.cpp
View File

@@ -143,7 +143,7 @@ public:
ObjectList GetLoadedObjects() override
{
ObjectList objectList;
for (auto objectType : ObjectTypes)
for (auto objectType : getAllObjectTypes())
{
auto maxObjectsOfType = static_cast<ObjectEntryIndex>(getObjectEntryGroupCount(objectType));
for (ObjectEntryIndex i = 0; i < maxObjectsOfType; i++)
@@ -312,7 +312,7 @@ private:
void UnloadAll(bool onlyTransient)
{
for (auto type : ObjectTypes)
for (auto type : getAllObjectTypes())
{
if (!onlyTransient || !IsIntransientObjectType(type))
{
@@ -443,7 +443,7 @@ private:
// Unload objects that are not in the hash set
size_t totalObjectsLoaded = 0;
size_t numObjectsUnloaded = 0;
for (auto type : ObjectTypes)
for (auto type : getAllObjectTypes())
{
if (!IsIntransientObjectType(type))
{
@@ -522,7 +522,7 @@ private:
std::vector<ObjectToLoad> requiredObjects;
std::vector<ObjectEntryDescriptor> missingObjects;
for (auto objectType : ObjectTypes)
for (auto objectType : getAllObjectTypes())
{
auto& descriptors = objectList.GetList(objectType);
auto maxSize = static_cast<size_t>(getObjectEntryGroupCount(objectType));
@@ -673,7 +673,7 @@ private:
}
// Set the new object lists
for (auto type : ObjectTypes)
for (auto type : getAllObjectTypes())
{
if (!IsIntransientObjectType(type))
{