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

Fix building

Browse Source
This commit is contained in:
ζeh Matt
2021-09-03 14:17:53 +03:00
parent a118b16912
commit cf0425d953
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -469,16 +469,10 @@ private:
log_verbose("%u / %u objects unloaded", numObjectsUnloaded, totalObjectsLoaded);
}
template<typename T> static void UpdateSceneryGroupIndexes(Object* object)
template<typename T> void UpdateSceneryGroupIndexes(Object* object)
{
auto* sceneryEntry = static_cast<T*>(object->GetLegacyData());
sceneryEntry->scenery_tab_id = GetPrimarySceneryGroupEntryIndex(loadedObject);
}
template<> static void UpdateSceneryGroupIndexes<SceneryGroupObject>(Object* object)
{
auto sgObject = dynamic_cast<SceneryGroupObject*>(object);
sgObject->UpdateEntryIndexes();
sceneryEntry->scenery_tab_id = GetPrimarySceneryGroupEntryIndex(object);
}
void UpdateSceneryGroupIndexes()
@@ -507,8 +501,11 @@ private:
UpdateSceneryGroupIndexes<PathBitEntry>(loadedObject);
break;
case ObjectType::SceneryGroup:
UpdateSceneryGroupIndexes<SceneryGroupObject>(loadedObject);
{
auto sgObject = dynamic_cast<SceneryGroupObject*>(loadedObject);
sgObject->UpdateEntryIndexes();
break;
}
default:
// This switch only handles scenery ObjectTypes.
break;

1
src/openrct2/object/ObjectManager.h
View File

@@ -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<rct_object_entry> GetInvalidObjects(const rct_object_entry* entries) abstract;
virtual Object* LoadObject(std::string_view identifier) abstract;
virtual Object* LoadObject(const rct_object_entry* entry) abstract;