From 84bdd120085b861394ed332a880d93f9f2cdd38d Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Mon, 27 May 2024 07:25:48 +0000 Subject: [PATCH] Rename MaxCarsPerTrain to kMaxTrainsPerRide --- src/openrct2-ui/windows/Ride.cpp | 4 ++-- src/openrct2/Limits.h | 8 ++++---- src/openrct2/ride/Ride.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 13013fb671..a854f4a5c0 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -2593,7 +2593,7 @@ static_assert(std::size(RatingNames) == 6); ride->SetNumTrains(ride->NumTrains - 1); break; case WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE: - if (ride->num_cars_per_train < OpenRCT2::Limits::MaxCarsPerTrain) + if (ride->num_cars_per_train < OpenRCT2::Limits::kMaxCarsPerTrain) ride->SetNumCarsPerVehicle(ride->num_cars_per_train + 1); break; case WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE: @@ -2897,7 +2897,7 @@ static_assert(std::size(RatingNames) == 6); // For each train for (int32_t i = 0; i < ride->NumTrains; i++) { - VehicleDrawInfo trainCarImages[OpenRCT2::Limits::MaxCarsPerTrain]; + VehicleDrawInfo trainCarImages[OpenRCT2::Limits::kMaxCarsPerTrain]; VehicleDrawInfo* nextSpriteToDraw = trainCarImages; int32_t x = startX; int32_t y = startY; diff --git a/src/openrct2/Limits.h b/src/openrct2/Limits.h index bbad836eb9..515441bd66 100644 --- a/src/openrct2/Limits.h +++ b/src/openrct2/Limits.h @@ -19,14 +19,14 @@ namespace OpenRCT2::Limits constexpr uint16_t kMaxHelices = RCT12::Limits::kMaxHelices; constexpr uint16_t kMaxInversions = RCT12::Limits::kMaxInversions; constexpr uint16_t kMaxTrainsPerRide = 255; - constexpr uint16_t MaxCarsPerTrain = 255; + constexpr uint16_t kMaxCarsPerTrain = 255; constexpr const uint16_t MaxVehicleColours = kMaxTrainsPerRide; // this should really be kMaxTrainsPerRide * - // MaxCarsPerTrain - // MaxVehicleColours should be set to kMaxTrainsPerRide or MaxCarsPerTrain, whichever is higher. + // kMaxCarsPerTrain + // MaxVehicleColours should be set to kMaxTrainsPerRide or kMaxCarsPerTrain, whichever is higher. // Sadly, using std::max() will cause compilation failures when using MaxVehicleColours as an array size, // hence the usage of static asserts. static_assert(MaxVehicleColours >= kMaxTrainsPerRide); - static_assert(MaxVehicleColours >= MaxCarsPerTrain); + static_assert(MaxVehicleColours >= kMaxCarsPerTrain); constexpr uint8_t MaxCircuitsPerRide = 20; constexpr uint8_t MaxAwards = RCT12::Limits::MaxAwards; constexpr uint8_t NumColourSchemes = RCT12::Limits::NumColourSchemes; diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 93a02b62af..47001fafa1 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -4718,11 +4718,11 @@ void RideUpdateVehicleColours(const Ride& ride) if (vehicle->HasFlag(VehicleFlags::CarIsReversed)) { colours = ride.vehicle_colours[std::min( - (ride.num_cars_per_train - 1) - carIndex, OpenRCT2::Limits::MaxCarsPerTrain - 1)]; + (ride.num_cars_per_train - 1) - carIndex, OpenRCT2::Limits::kMaxCarsPerTrain - 1)]; } else { - colours = ride.vehicle_colours[std::min(carIndex, OpenRCT2::Limits::MaxCarsPerTrain - 1)]; + colours = ride.vehicle_colours[std::min(carIndex, OpenRCT2::Limits::kMaxCarsPerTrain - 1)]; } break; }