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

Move the log print and remove optional parameter

Browse Source
This commit is contained in:
ζeh Matt
2021-09-03 14:01:34 +03:00
parent 1f4f0c015c
commit a44f3017dc
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,14 +119,17 @@ public:
auto requiredObjects = GetRequiredObjects(entries, count);
// Load the required objects
size_t numNewLoadedObjects = 0;
auto loadedObjects = LoadObjects(requiredObjects, &numNewLoadedObjects);
{
auto loadedObjects = LoadObjects(requiredObjects);
SetNewLoadedObjectList(std::move(loadedObjects));
}
SetNewLoadedObjectList(std::move(loadedObjects));
// Load defaults.
LoadDefaultObjects();
// Update indices.
UpdateSceneryGroupIndexes();
ResetTypeToRideEntryIndexMap();
log_verbose("%u / %u new objects loaded", numNewLoadedObjects, requiredObjects.size());
}
void UnloadObjects(const std::vector<rct_object_entry>& entries) override
@@ -644,7 +647,7 @@ private:
}
}
std::vector<Object*> LoadObjects(std::vector<const ObjectRepositoryItem*>& requiredObjects, size_t* outNewObjectsLoaded)
std::vector<Object*> LoadObjects(std::vector<const ObjectRepositoryItem*>& requiredObjects)
{
std::vector<Object*> objects;
std::vector<Object*> newLoadedObjects;
@@ -703,10 +706,7 @@ private:
throw ObjectLoadException(std::move(badObjects));
}
if (outNewObjectsLoaded != nullptr)
{
*outNewObjectsLoaded = newLoadedObjects.size();
}
log_verbose("%u / %u new objects loaded", newLoadedObjects.size(), requiredObjects.size());
return objects;
}