mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity

Convert most remaining C-style casts to C++-style ones (#11867)

Browse Source
This commit is contained in:
Michael Steenbeek
2020-06-07 23:18:11 +02:00
committed by GitHub
parent 7646f1b7e4
commit 9ef8d6da42
43 changed files with 126 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -722,14 +722,14 @@ void* object_manager_get_loaded_object_by_index(size_t index)
{
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* loadedObject = objectManager.GetLoadedObject(index);
return (void*)loadedObject;
return static_cast<void*>(loadedObject);
}
void* object_manager_get_loaded_object(const rct_object_entry* entry)
{
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* loadedObject = objectManager.GetLoadedObject(entry);
return (void*)loadedObject;
return static_cast<void*>(loadedObject);
}
ObjectEntryIndex object_manager_get_loaded_object_entry_index(const void* loadedObject)
@@ -744,7 +744,7 @@ void* object_manager_load_object(const rct_object_entry* entry)
{
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
Object* loadedObject = objectManager.LoadObject(entry);
return (void*)loadedObject;
return static_cast<void*>(loadedObject);
}
void object_manager_unload_objects(const rct_object_entry* entries, size_t count)