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

Refactor more constants to kConstant notation

Browse Source
This commit is contained in:
Michael Steenbeek
2025-01-22 17:16:55 +01:00
committed by GitHub
parent b9486b9eb7
commit b0c99fcb6c
254 changed files with 1244 additions and 1249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ public:
Object* GetLoadedObject(ObjectType objectType, size_t index) override
{
// This is sometimes done deliberately (to avoid boilerplate), so no need to log_warn for this.
if (index == OBJECT_ENTRY_INDEX_NULL)
if (index == kObjectEntryIndexNull)
{
return nullptr;
}
@@ -88,7 +88,7 @@ public:
if (index >= static_cast<size_t>(getObjectEntryGroupCount(objectType)))
{
#ifdef DEBUG
if (index != OBJECT_ENTRY_INDEX_NULL)
if (index != kObjectEntryIndexNull)
{
LOG_WARNING("Object index %u exceeds maximum for type %d.", index, objectType);
}
@@ -121,7 +121,7 @@ public:
{
return GetLoadedObjectEntryIndex(obj);
}
return OBJECT_ENTRY_INDEX_NULL;
return kObjectEntryIndexNull;
}
ObjectEntryIndex GetLoadedObjectEntryIndex(const ObjectEntryDescriptor& descriptor) override
@@ -131,12 +131,12 @@ public:
{
return GetLoadedObjectEntryIndex(obj);
}
return OBJECT_ENTRY_INDEX_NULL;
return kObjectEntryIndexNull;
}
ObjectEntryIndex GetLoadedObjectEntryIndex(const Object* object) override
{
ObjectEntryIndex result = OBJECT_ENTRY_INDEX_NULL;
ObjectEntryIndex result = kObjectEntryIndexNull;
size_t index = GetLoadedObjectIndex(object);
if (index != SIZE_MAX)
{
@@ -511,7 +511,7 @@ private:
const auto& primarySGEntry = sceneryObject->GetPrimarySceneryGroup();
Object* sgObject = GetLoadedObject(primarySGEntry);
auto entryIndex = OBJECT_ENTRY_INDEX_NULL;
auto entryIndex = kObjectEntryIndexNull;
if (sgObject != nullptr)
{
entryIndex = GetLoadedObjectEntryIndex(sgObject);