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

Remove hardcoded terrain style constants from RCT1 and MapGen

Browse Source
This commit is contained in:
Gymnasiast
2021-03-27 13:48:27 +01:00
parent 7a29350688
commit b3bbdcbfd5
20 changed files with 204 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -816,26 +816,30 @@ Object* object_manager_get_loaded_object_by_index(size_t index)
return loadedObject;
}
Object* object_manager_get_loaded_object(const rct_object_entry* entry)
Object* object_manager_get_loaded_object(const ObjectEntryDescriptor& entry)
{
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* loadedObject = objectManager.GetLoadedObject(ObjectEntryDescriptor(*entry));
Object* loadedObject = objectManager.GetLoadedObject(entry);
return loadedObject;
}
ObjectEntryIndex object_manager_get_loaded_object_entry_index(const void* loadedObject)
ObjectEntryIndex object_manager_get_loaded_object_entry_index(const Object* loadedObject)
{
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
const Object* object = static_cast<const Object*>(loadedObject);
auto entryIndex = objectManager.GetLoadedObjectEntryIndex(object);
auto entryIndex = objectManager.GetLoadedObjectEntryIndex(loadedObject);
return entryIndex;
}
void* object_manager_load_object(const rct_object_entry* entry)
ObjectEntryIndex object_manager_get_loaded_object_entry_index(const ObjectEntryDescriptor& entry)
{
return object_manager_get_loaded_object_entry_index(object_manager_get_loaded_object(entry));
}
Object* object_manager_load_object(const rct_object_entry* entry)
{
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* loadedObject = objectManager.LoadObject(entry);
return static_cast<void*>(loadedObject);
return loadedObject;
}
void object_manager_unload_objects(const std::vector<rct_object_entry>& entries)