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

Update objects to v1.0.21

Browse Source
This commit is contained in:
Michael Steenbeek
2021-03-12 11:04:04 +01:00
committed by GitHub
parent cffb467a77
commit f0dc28e9fc
16 changed files with 54 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ public:
return GetLoadedObject(objectIndex);
}
Object* GetLoadedObject(const rct_object_entry* entry) override
Object* GetLoadedObject(const ObjectEntryDescriptor& entry) override
{
Object* loadedObject = nullptr;
const ObjectRepositoryItem* ori = _objectRepository.FindObject(entry);
@@ -534,7 +534,7 @@ private:
ObjectEntryIndex GetPrimarySceneryGroupEntryIndex(Object* loadedObject)
{
auto sceneryObject = dynamic_cast<SceneryObject*>(loadedObject);
const rct_object_entry* primarySGEntry = sceneryObject->GetPrimarySceneryGroup();
const auto& primarySGEntry = sceneryObject->GetPrimarySceneryGroup();
Object* sgObject = GetLoadedObject(primarySGEntry);
auto entryIndex = OBJECT_ENTRY_INDEX_NULL;
@@ -819,7 +819,7 @@ Object* object_manager_get_loaded_object_by_index(size_t index)
Object* object_manager_get_loaded_object(const rct_object_entry* entry)
{
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* loadedObject = objectManager.GetLoadedObject(entry);
Object* loadedObject = objectManager.GetLoadedObject(ObjectEntryDescriptor(*entry));
return loadedObject;
}