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

Replace object_entry_get_type() with method (#10937)

Browse Source
This commit is contained in:
Michael Steenbeek
2020-03-15 12:07:04 +01:00
committed by GitHub
parent c31ef8e635
commit 18ebe73dfa
12 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,7 +105,7 @@ public:
loadedObject = ori->LoadedObject;
if (loadedObject == nullptr)
{
uint8_t objectType = object_entry_get_type(&ori->ObjectEntry);
uint8_t objectType = ori->ObjectEntry.GetType();
int32_t slot = FindSpareSlot(objectType);
if (slot != -1)
{
@@ -479,7 +479,7 @@ private:
ori = _objectRepository.FindObject(&entry);
if (ori == nullptr)
{
if (object_entry_get_type(&entry) != OBJECT_TYPE_SCENARIO_TEXT)
if (entry.GetType() != OBJECT_TYPE_SCENARIO_TEXT)
{
invalidEntries.push_back(entry);
ReportMissingObject(&entry);
@@ -521,7 +521,7 @@ private:
if (!object_entry_is_empty(entry))
{
ori = _objectRepository.FindObject(entry);
if (ori == nullptr && object_entry_get_type(entry) != OBJECT_TYPE_SCENARIO_TEXT)
if (ori == nullptr && entry->GetType() != OBJECT_TYPE_SCENARIO_TEXT)
{
missingObjects.push_back(*entry);
ReportMissingObject(entry);