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

Rename ObjectType enum to follow recent code style (#23810)

Browse Source
This commit is contained in:
Aaron van Geffen
2025-02-13 23:07:55 +01:00
committed by GitHub
parent b9b2c96c97
commit bb94ee8bc0
75 changed files with 446 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ class ObjectManager final : public IObjectManager
private:
IObjectRepository& _objectRepository;
std::array<std::vector<Object*>, EnumValue(ObjectType::Count)> _loadedObjects;
std::array<std::vector<Object*>, EnumValue(ObjectType::count)> _loadedObjects;
std::array<std::vector<ObjectEntryIndex>, RIDE_TYPE_COUNT> _rideTypeToObjectMap;
// Used to return a safe empty vector back from GetAllRideEntries, can be removed when std::span is available
@@ -488,13 +488,13 @@ private:
void UpdateSceneryGroupIndexes()
{
UpdateSceneryGroupIndexes<SmallSceneryEntry>(ObjectType::SmallScenery);
UpdateSceneryGroupIndexes<LargeSceneryEntry>(ObjectType::LargeScenery);
UpdateSceneryGroupIndexes<WallSceneryEntry>(ObjectType::Walls);
UpdateSceneryGroupIndexes<BannerSceneryEntry>(ObjectType::Banners);
UpdateSceneryGroupIndexes<PathAdditionEntry>(ObjectType::PathAdditions);
UpdateSceneryGroupIndexes<SmallSceneryEntry>(ObjectType::smallScenery);
UpdateSceneryGroupIndexes<LargeSceneryEntry>(ObjectType::largeScenery);
UpdateSceneryGroupIndexes<WallSceneryEntry>(ObjectType::walls);
UpdateSceneryGroupIndexes<BannerSceneryEntry>(ObjectType::banners);
UpdateSceneryGroupIndexes<PathAdditionEntry>(ObjectType::pathAdditions);
auto& list = GetObjectList(ObjectType::SceneryGroup);
auto& list = GetObjectList(ObjectType::sceneryGroup);
for (auto* loadedObject : list)
{
auto sgObject = static_cast<SceneryGroupObject*>(loadedObject);
@@ -535,7 +535,7 @@ private:
if (entry.HasValue())
{
const auto* ori = _objectRepository.FindObject(entry);
if (ori == nullptr && entry.GetType() == ObjectType::ScenarioText)
if (ori == nullptr && entry.GetType() == ObjectType::scenarioText)
{
continue;
}
@@ -735,10 +735,10 @@ private:
}
// Build object lists
const auto maxRideObjects = static_cast<size_t>(getObjectEntryGroupCount(ObjectType::Ride));
const auto maxRideObjects = static_cast<size_t>(getObjectEntryGroupCount(ObjectType::ride));
for (size_t i = 0; i < maxRideObjects; i++)
{
auto* rideObject = static_cast<RideObject*>(GetLoadedObject(ObjectType::Ride, i));
auto* rideObject = static_cast<RideObject*>(GetLoadedObject(ObjectType::ride, i));
if (rideObject == nullptr)
continue;