diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 3a9c626fbf67..b455212d3cfe 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -1347,7 +1347,7 @@ namespace OpenRCT2 static std::vector LegacyGetRideTypesBeenOn(const std::array& srcArray) { std::vector ridesTypesBeenOn; - for (ObjectEntryIndex i = 0; i < RCT2::Limits::MaxRideObject; i++) + for (ObjectEntryIndex i = 0; i < RCT2::Limits::MaxRideObjects; i++) { if (srcArray[i / 8] & (1 << (i % 8))) { diff --git a/src/openrct2/rct12/Limits.h b/src/openrct2/rct12/Limits.h index 5c1b0e0cb219..f69e87b40b6b 100644 --- a/src/openrct2/rct12/Limits.h +++ b/src/openrct2/rct12/Limits.h @@ -12,7 +12,7 @@ namespace RCT12::Limits { - constexpr const uint8_t MaxRideObject = 128; + constexpr const uint8_t MaxRideObjects = 128; constexpr const uint8_t MaxRidesInPark = 255; constexpr const uint8_t MaxAwards = 4; diff --git a/src/openrct2/rct12/RCT12.h b/src/openrct2/rct12/RCT12.h index e9e0320d6e6c..69f842bdaeda 100644 --- a/src/openrct2/rct12/RCT12.h +++ b/src/openrct2/rct12/RCT12.h @@ -865,7 +865,7 @@ money64 RCT12CompletedCompanyValueToOpenRCT2(money32 origValue); template std::vector RCT12GetRideTypesBeenOn(T* srcPeep) { std::vector ridesTypesBeenOn; - for (uint16_t i = 0; i < RCT12::Limits::MaxRideObject; i++) + for (uint16_t i = 0; i < RCT12::Limits::MaxRideObjects; i++) { if (srcPeep->ride_types_been_on[i / 8] & (1 << (i % 8))) { diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index 94787ea945b4..fa31c3f51ce3 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -29,7 +29,7 @@ namespace RCT2 // clang-format off constexpr const uint16_t RCT2_OBJECT_ENTRY_COUNT = - Limits::MaxRideObject + + Limits::MaxRideObjects + Limits::MaxSmallSceneryObjects + Limits::MaxLargeSceneryObjects + Limits::MaxWallSceneryObjects + @@ -45,7 +45,7 @@ namespace RCT2 // clang-format off constexpr const int32_t rct2_object_entry_group_counts[] = { - Limits::MaxRideObject, + Limits::MaxRideObjects, Limits::MaxSmallSceneryObjects, Limits::MaxLargeSceneryObjects, Limits::MaxWallSceneryObjects, @@ -813,7 +813,7 @@ namespace RCT2 rct_object_entry Objects[RCT2_OBJECT_ENTRY_COUNT]; struct { - rct_object_entry RideObjects[Limits::MaxRideObject]; + rct_object_entry RideObjects[Limits::MaxRideObjects]; rct_object_entry SceneryObjects[Limits::MaxSmallSceneryObjects]; rct_object_entry LargeSceneryObjects[Limits::MaxLargeSceneryObjects]; rct_object_entry WallSceneryObjects[Limits::MaxWallSceneryObjects];