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

cope with same loaded object for multiple slots

Browse Source
This commit is contained in:
Ted John
2016-07-09 15:57:48 +01:00
parent 4de1f2912a
commit 234471c3fc
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/object/ObjectManager.cpp
View File

@@ -156,8 +156,6 @@ public:
size_t index = GetLoadedObjectIndex(loadedObject);
UnloadObject(loadedObject);
_loadedObjects[index] = nullptr;
numObjectsUnloaded++;
}
}
@@ -177,7 +175,6 @@ public:
for (int i = 0; i < OBJECT_ENTRY_COUNT; i++)
{
UnloadObject(_loadedObjects[i]);
_loadedObjects[i] = nullptr;
}
}
UpdateLegacyLoadedObjectList();
@@ -263,6 +260,19 @@ private:
object->Unload();
delete object;
// Because its possible to have the same loaded object for multiple
// slots, we have to make sure find and set all of them to nullptr
if (_loadedObjects != nullptr)
{
for (size_t i = 0; i < OBJECT_ENTRY_COUNT; i++)
{
if (_loadedObjects[i] == object)
{
_loadedObjects[i] = nullptr;
}
}
}
}
}
@@ -296,7 +306,6 @@ private:
if (exceptSet.find(object) == exceptSet.end())
{
UnloadObject(object);
_loadedObjects[i] = nullptr;
numObjectsUnloaded++;
}
}