From cf0425d9538d05f194a45dc37cbb3bd738cdbf70 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:17:53 +0300 Subject: [PATCH] Fix building --- src/openrct2/object/ObjectManager.cpp | 15 ++++++--------- src/openrct2/object/ObjectManager.h | 1 - 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp index 4a125b8ad1..acb487a00e 100644 --- a/src/openrct2/object/ObjectManager.cpp +++ b/src/openrct2/object/ObjectManager.cpp @@ -469,16 +469,10 @@ private: log_verbose("%u / %u objects unloaded", numObjectsUnloaded, totalObjectsLoaded); } - template static void UpdateSceneryGroupIndexes(Object* object) + template void UpdateSceneryGroupIndexes(Object* object) { auto* sceneryEntry = static_cast(object->GetLegacyData()); - sceneryEntry->scenery_tab_id = GetPrimarySceneryGroupEntryIndex(loadedObject); - } - - template<> static void UpdateSceneryGroupIndexes(Object* object) - { - auto sgObject = dynamic_cast(object); - sgObject->UpdateEntryIndexes(); + sceneryEntry->scenery_tab_id = GetPrimarySceneryGroupEntryIndex(object); } void UpdateSceneryGroupIndexes() @@ -507,8 +501,11 @@ private: UpdateSceneryGroupIndexes(loadedObject); break; case ObjectType::SceneryGroup: - UpdateSceneryGroupIndexes(loadedObject); + { + auto sgObject = dynamic_cast(loadedObject); + sgObject->UpdateEntryIndexes(); break; + } default: // This switch only handles scenery ObjectTypes. break; diff --git a/src/openrct2/object/ObjectManager.h b/src/openrct2/object/ObjectManager.h index ed22926211..a93b9f5c10 100644 --- a/src/openrct2/object/ObjectManager.h +++ b/src/openrct2/object/ObjectManager.h @@ -28,7 +28,6 @@ struct IObjectManager virtual Object* GetLoadedObject(ObjectType objectType, size_t index) abstract; virtual Object* GetLoadedObject(const ObjectEntryDescriptor& entry) abstract; virtual ObjectEntryIndex GetLoadedObjectEntryIndex(const Object* object) abstract; - virtual std::vector GetInvalidObjects(const rct_object_entry* entries) abstract; virtual Object* LoadObject(std::string_view identifier) abstract; virtual Object* LoadObject(const rct_object_entry* entry) abstract;