From 1c3cb890e045f4af19a36365f3aa186da4bd5293 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 6 Mar 2025 23:32:17 +0100 Subject: [PATCH] Rename NoFlatRideCars to kNoFlatRideCars --- src/openrct2/actions/RideCreateAction.cpp | 2 +- src/openrct2/object/RideObject.cpp | 2 +- src/openrct2/ride/Ride.cpp | 2 +- src/openrct2/ride/RideEntry.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2/actions/RideCreateAction.cpp b/src/openrct2/actions/RideCreateAction.cpp index 985f386c34..dcb3c769ef 100644 --- a/src/openrct2/actions/RideCreateAction.cpp +++ b/src/openrct2/actions/RideCreateAction.cpp @@ -162,7 +162,7 @@ GameActions::Result RideCreateAction::Execute() const if (gameState.Cheats.disableTrainLengthLimit) { // Reduce amount of proposed trains to prevent 32 trains from always spawning when limits are disabled - if (rideEntry->cars_per_flat_ride == NoFlatRideCars) + if (rideEntry->cars_per_flat_ride == kNoFlatRideCars) { ride->ProposedNumTrains = 12; } diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index d121c4b467..fc1825da95 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -648,7 +648,7 @@ void RideObject::ReadJsonVehicleInfo([[maybe_unused]] IReadObjectContext* contex _legacyType.min_cars_in_train = Json::GetNumber(properties["minCarsPerTrain"], 1); _legacyType.max_cars_in_train = Json::GetNumber(properties["maxCarsPerTrain"], 1); - _legacyType.cars_per_flat_ride = Json::GetNumber(properties["carsPerFlatRide"], NoFlatRideCars); + _legacyType.cars_per_flat_ride = Json::GetNumber(properties["carsPerFlatRide"], kNoFlatRideCars); _legacyType.zero_cars = Json::GetNumber(properties["numEmptyCars"]); // Train formation from car indices diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 161cc4b0d6..0309ed29cb 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -5073,7 +5073,7 @@ void Ride::UpdateMaxVehicles() int32_t maxNumTrains; const auto& rtd = GetRideTypeDescriptor(); - if (rideEntry->cars_per_flat_ride == NoFlatRideCars) + if (rideEntry->cars_per_flat_ride == kNoFlatRideCars) { num_cars_per_train = std::max(rideEntry->min_cars_in_train, num_cars_per_train); MinCarsPerTrain = rideEntry->min_cars_in_train; diff --git a/src/openrct2/ride/RideEntry.h b/src/openrct2/ride/RideEntry.h index 3a26a41c0a..356b62508d 100644 --- a/src/openrct2/ride/RideEntry.h +++ b/src/openrct2/ride/RideEntry.h @@ -19,7 +19,7 @@ #include // Set to 255 on all tracked ride entries -static uint8_t constexpr NoFlatRideCars = 0xFF; +static uint8_t constexpr kNoFlatRideCars = 0xFF; static ride_type_t constexpr kRideTypeNull = 0xFF; struct RideNaming