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

Close #12290: Refactor of object_manager_unload_objects (#12291)

Browse Source
This commit is contained in:
frutiemax
2020-07-17 00:25:35 -04:00
committed by GitHub
parent 8aa8d77ca1
commit 77d02c5e2b
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,17 +147,16 @@ public:
log_verbose("%u / %u new objects loaded", numNewLoadedObjects, requiredObjects.size());
}
void UnloadObjects(const std::vector<rct_object_entry>& entries, size_t count) override
void UnloadObjects(const std::vector<rct_object_entry>& entries) override
{
// TODO there are two performance issues here:
// - FindObject for every entry which is a dictionary lookup
// - GetLoadedObjectIndex for every entry which enumerates _loadedList
size_t numObjectsUnloaded = 0;
for (size_t i = 0; i < count; i++)
for (const auto& entry : entries)
{
const rct_object_entry* entry = &entries[i];
const ObjectRepositoryItem* ori = _objectRepository.FindObject(entry);
const ObjectRepositoryItem* ori = _objectRepository.FindObject(&entry);
if (ori != nullptr)
{
Object* loadedObject = ori->LoadedObject;
@@ -747,10 +746,10 @@ void* object_manager_load_object(const rct_object_entry* entry)
return static_cast<void*>(loadedObject);
}
void object_manager_unload_objects(const std::vector<rct_object_entry>& entries, size_t count)
void object_manager_unload_objects(const std::vector<rct_object_entry>& entries)
{
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
objectManager.UnloadObjects(entries, count);
objectManager.UnloadObjects(entries);
}
void object_manager_unload_all_objects()