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

Fix a typo

Browse Source
This commit is contained in:
Michael Steenbeek
2022-02-08 18:27:08 +01:00
committed by GitHub
parent 1062c3d08d
commit 9466e27c68
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/park/ParkFile.cpp
View File

@@ -1347,7 +1347,7 @@ namespace OpenRCT2
static std::vector<ObjectEntryIndex> LegacyGetRideTypesBeenOn(const std::array<uint8_t, 16>& srcArray)
{
std::vector<ObjectEntryIndex> 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)))
{

2
src/openrct2/rct12/Limits.h
View File

@@ -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;

2
src/openrct2/rct12/RCT12.h
View File

@@ -865,7 +865,7 @@ money64 RCT12CompletedCompanyValueToOpenRCT2(money32 origValue);
template<typename T> std::vector<uint16_t> RCT12GetRideTypesBeenOn(T* srcPeep)
{
std::vector<uint16_t> 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)))
{

6
src/openrct2/rct2/RCT2.h
View File

@@ -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];