From a44f3017dc276843bb5f1bb2de9004054688d967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Fri, 3 Sep 2021 14:01:34 +0300
Subject: [PATCH] Move the log print and remove optional parameter

---
 src/openrct2/object/ObjectManager.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp
index c0bcc39faa..14902b118c 100644
--- a/src/openrct2/object/ObjectManager.cpp
+++ b/src/openrct2/object/ObjectManager.cpp
@@ -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;
     }