diff --git a/src/openrct2-ui/interface/Objective.cpp b/src/openrct2-ui/interface/Objective.cpp index cc18987d26..d27e799ceb 100644 --- a/src/openrct2-ui/interface/Objective.cpp +++ b/src/openrct2-ui/interface/Objective.cpp @@ -63,7 +63,7 @@ namespace OpenRCT2::Ui ft.Add(objective.NumGuests); ft.Add(DateGetTotalMonths(MONTH_OCTOBER, objective.Year)); if (objective.Type == OBJECTIVE_FINISH_5_ROLLERCOASTERS) - ft.Add(objective.MinimumExcitement); + ft.Add(objective.MinimumExcitement); else ft.Add(objective.Currency); } diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index 93f41366e7..ebad66b0f2 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -48,9 +48,9 @@ namespace OpenRCT2::Ui::Windows static constexpr uint16_t kObjectiveLengthMin = 1000; static constexpr uint16_t kObjectiveLengthAdjustment = 100; - static constexpr uint16_t kObjectiveExcitementMax = FIXED_2DP(9, 90); - static constexpr uint16_t kObjectiveExcitementMin = FIXED_2DP(4, 00); - static constexpr uint16_t kObjectiveExcitementAdjustment = FIXED_2DP(0, 10); + static constexpr ride_rating kObjectiveExcitementMax = MakeRideRating(9, 90); + static constexpr ride_rating kObjectiveExcitementMin = MakeRideRating(4, 00); + static constexpr ride_rating kObjectiveExcitementAdjustment = MakeRideRating(0, 10); // The number has to leave a bit of room for other entities like vehicles, litter and balloons. static constexpr uint16_t kObjectiveGuestsMax = 50000; @@ -413,7 +413,7 @@ namespace OpenRCT2::Ui::Windows gameState.ScenarioObjective.MinimumLength = 1200; break; case OBJECTIVE_FINISH_5_ROLLERCOASTERS: - gameState.ScenarioObjective.MinimumExcitement = FIXED_2DP(6, 70); + gameState.ScenarioObjective.MinimumExcitement = MakeRideRating(6, 70); break; case OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE: gameState.ScenarioObjective.Currency = 50000.00_GBP; diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 6eed235e52..6441b9bcdf 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -611,8 +611,8 @@ namespace OpenRCT2::Ui::Windows }; static_assert(std::size(GraphsYAxisDetails) == 4); - static constexpr auto RIDE_G_FORCES_RED_NEG_VERTICAL = -FIXED_2DP(2, 50); - static constexpr auto RIDE_G_FORCES_RED_LATERAL = FIXED_2DP(2, 80); + static constexpr auto kRideGForcesRedNegVertical = -MakeFixed16_2dp(2, 50); + static constexpr auto kRideGForcesRedLateral = MakeFixed16_2dp(2, 80); // Used for sorting the ride type cheat dropdown. struct RideTypeLabel @@ -5648,7 +5648,7 @@ namespace OpenRCT2::Ui::Windows stringId = STR_INTENSITY_RATING; if (!RideHasRatings(*ride)) stringId = STR_INTENSITY_RATING_NOT_YET_AVAILABLE; - else if (ride->ratings.intensity >= RIDE_RATING(10, 00)) + else if (ride->ratings.intensity >= MakeRideRating(10, 00)) stringId = STR_INTENSITY_RATING_RED; DrawTextBasic(dpi, screenCoords, stringId, ft); @@ -5784,7 +5784,7 @@ namespace OpenRCT2::Ui::Windows screenCoords.y += kListRowHeight; // Max. negative vertical G's - stringId = ride->max_negative_vertical_g <= RIDE_G_FORCES_RED_NEG_VERTICAL + stringId = ride->max_negative_vertical_g <= kRideGForcesRedNegVertical ? STR_MAX_NEGATIVE_VERTICAL_G_RED : STR_MAX_NEGATIVE_VERTICAL_G; ft = Formatter(); @@ -5793,8 +5793,7 @@ namespace OpenRCT2::Ui::Windows screenCoords.y += kListRowHeight; // Max lateral G's - stringId = ride->max_lateral_g > RIDE_G_FORCES_RED_LATERAL ? STR_MAX_LATERAL_G_RED - : STR_MAX_LATERAL_G; + stringId = ride->max_lateral_g > kRideGForcesRedLateral ? STR_MAX_LATERAL_G_RED : STR_MAX_LATERAL_G; ft = Formatter(); ft.Add(ride->max_lateral_g); DrawTextBasic(dpi, screenCoords, stringId, ft); @@ -6163,13 +6162,13 @@ namespace OpenRCT2::Ui::Windows case GRAPH_VERTICAL: firstPoint = measurement->vertical[x] + VerticalGraphHeightOffset; secondPoint = measurement->vertical[x + 1] + VerticalGraphHeightOffset; - intensityThresholdNegative = (RIDE_G_FORCES_RED_NEG_VERTICAL / 8) + VerticalGraphHeightOffset; + intensityThresholdNegative = (kRideGForcesRedNegVertical / 8) + VerticalGraphHeightOffset; break; case GRAPH_LATERAL: firstPoint = measurement->lateral[x] + LateralGraphHeightOffset; secondPoint = measurement->lateral[x + 1] + LateralGraphHeightOffset; - intensityThresholdPositive = (RIDE_G_FORCES_RED_LATERAL / 8) + LateralGraphHeightOffset; - intensityThresholdNegative = -(RIDE_G_FORCES_RED_LATERAL / 8) + LateralGraphHeightOffset; + intensityThresholdPositive = (kRideGForcesRedLateral / 8) + LateralGraphHeightOffset; + intensityThresholdNegative = -(kRideGForcesRedLateral / 8) + LateralGraphHeightOffset; break; default: LOG_ERROR("Wrong graph type %d", listType); diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index 1e6ea9b1e1..8965a2828f 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -304,7 +304,7 @@ namespace OpenRCT2::Ui::Windows { // Height label is Units. auto ft = Formatter(); - ft.Add(static_cast(FIXED_1DP(gClipHeight, 0) / 2 - FIXED_1DP(7, 0))); + ft.Add((MakeFixed1dp(gClipHeight, 0) / 2 - MakeFixed1dp(7, 0))); DrawTextBasic( dpi, screenCoords, STR_UNIT1DP_NO_SUFFIX, ft, { this->colours[0] }); // Printing the value in Height Units. @@ -320,7 +320,7 @@ namespace OpenRCT2::Ui::Windows { auto ft = Formatter(); ft.Add( - static_cast(FIXED_2DP(gClipHeight, 0) / 2 * 1.5f - FIXED_2DP(10, 50))); + MakeFixed2dp(gClipHeight, 0) / 2 * 1.5f - MakeFixed2dp(10, 50)); DrawTextBasic(dpi, screenCoords, STR_UNIT2DP_SUFFIX_METRES, ft, { this->colours[0] }); break; } @@ -328,7 +328,7 @@ namespace OpenRCT2::Ui::Windows { auto ft = Formatter(); ft.Add( - static_cast(FIXED_1DP(gClipHeight, 0) / 2.0f * 5 - FIXED_1DP(35, 0))); + MakeFixed1dp(gClipHeight, 0) / 2.0f * 5 - MakeFixed1dp(35, 0)); DrawTextBasic(dpi, screenCoords, STR_UNIT1DP_SUFFIX_FEET, ft, { this->colours[0] }); break; } diff --git a/src/openrct2/core/FixedPoint.hpp b/src/openrct2/core/FixedPoint.hpp index ba18e227ef..d892d01a86 100644 --- a/src/openrct2/core/FixedPoint.hpp +++ b/src/openrct2/core/FixedPoint.hpp @@ -21,7 +21,26 @@ using fixed32_2dp = int32_t; using fixed64_1dp = int64_t; // Construct a fixed point number. For example, to create the value 3.65 you -// would write FIXED_2DP(3,65) -#define FIXED_XDP(x, whole, fraction) ((whole) * (10 * (x)) + (fraction)) -#define FIXED_1DP(whole, fraction) FIXED_XDP(1, whole, fraction) -#define FIXED_2DP(whole, fraction) FIXED_XDP(10, whole, fraction) +// would write MakeFixed2dp(3, 65) +template +static constexpr T MakeFixedXdp(T whole, uint8_t fraction) +{ + return (whole * factor) + fraction; +} + +template +constexpr T MakeFixed1dp(T whole, uint8_t fraction) +{ + return MakeFixedXdp(whole, fraction); +} + +template +constexpr T MakeFixed2dp(T whole, uint8_t fraction) +{ + return MakeFixedXdp(whole, fraction); +} + +constexpr fixed16_2dp MakeFixed16_2dp(int16_t whole, uint8_t fraction) +{ + return MakeFixed2dp(whole, fraction); +} diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index bea039e15e..48dda32440 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -1935,7 +1935,7 @@ OpenRCT2::BitSet Guest::FindRidesToGoOn() // Always take the tall rides into consideration (realistic as you can usually see them from anywhere in the park) for (auto& ride : GetRideManager()) { - if (ride.highest_drop_height > 66 || ride.ratings.excitement >= RIDE_RATING(8, 00)) + if (ride.highest_drop_height > 66 || ride.ratings.excitement >= MakeRideRating(8, 00)) { rideConsideration[ride.id.ToUnderlying()] = true; } @@ -2074,7 +2074,7 @@ bool Guest::ShouldGoOnRide(Ride& ride, StationIndex entranceNum, bool atQueue, b // excitement check and will only do a basic intensity check when they arrive at the ride itself. if (ride.id == GuestHeadingToRideId) { - if (ride.ratings.intensity > RIDE_RATING(10, 00) && !GetGameState().Cheats.ignoreRideIntensity) + if (ride.ratings.intensity > MakeRideRating(10, 00) && !GetGameState().Cheats.ignoreRideIntensity) { PeepRideIsTooIntense(this, ride, peepAtRide); return false; @@ -2147,7 +2147,7 @@ bool Guest::ShouldGoOnRide(Ride& ride, StationIndex entranceNum, bool atQueue, b } // Very nauseous peeps will only go on very gentle rides. - if (ride.ratings.nausea >= FIXED_2DP(1, 40) && Nausea > 160) + if (ride.ratings.nausea >= MakeRideRating(1, 40) && Nausea > 160) { ChoseNotToGoOnRide(ride, peepAtRide, false); return false; @@ -2169,8 +2169,9 @@ bool Guest::ShouldGoOnRide(Ride& ride, StationIndex entranceNum, bool atQueue, b if (!GetGameState().Cheats.ignoreRideIntensity) { - if (ride.max_positive_vertical_g > FIXED_2DP(5, 00) || ride.max_negative_vertical_g < FIXED_2DP(-4, 00) - || ride.max_lateral_g > FIXED_2DP(4, 00)) + if (ride.max_positive_vertical_g > MakeFixed16_2dp(5, 00) + || ride.max_negative_vertical_g < MakeFixed16_2dp(-4, 00) + || ride.max_lateral_g > MakeFixed16_2dp(4, 00)) { ChoseNotToGoOnRide(ride, peepAtRide, false); return false; @@ -2882,7 +2883,7 @@ static bool PeepShouldGoOnRideAgain(Guest* peep, const Ride& ride) return false; if (!RideHasRatings(ride)) return false; - if (ride.ratings.intensity > RIDE_RATING(10, 00) && !GetGameState().Cheats.ignoreRideIntensity) + if (ride.ratings.intensity > MakeRideRating(10, 00) && !GetGameState().Cheats.ignoreRideIntensity) return false; if (peep->Happiness < 180) return false; @@ -2927,7 +2928,7 @@ static bool PeepReallyLikedRide(Guest* peep, const Ride& ride) return false; if (!RideHasRatings(ride)) return false; - if (ride.ratings.intensity > RIDE_RATING(10, 00) && !GetGameState().Cheats.ignoreRideIntensity) + if (ride.ratings.intensity > MakeRideRating(10, 00) && !GetGameState().Cheats.ignoreRideIntensity) return false; return true; } @@ -6320,12 +6321,12 @@ static bool PeepShouldWatchRide(TileElement* tileElement) return true; } - if (ride->ratings.excitement >= RIDE_RATING(4, 70)) + if (ride->ratings.excitement >= MakeRideRating(4, 70)) { return true; } - if (ride->ratings.intensity >= RIDE_RATING(4, 50)) + if (ride->ratings.intensity >= MakeRideRating(4, 50)) { return true; } diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index 74a6d8488c..446861ef3d 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -468,7 +468,7 @@ static bool AwardIsDeservedBestCustomDesignedRides(int32_t activeAwardTypes) continue; if (ride.lifecycle_flags & RIDE_LIFECYCLE_NOT_CUSTOM_DESIGN) continue; - if (ride.ratings.excitement < RIDE_RATING(5, 50)) + if (ride.ratings.excitement < MakeRideRating(5, 50)) continue; if (ride.status != RideStatus::Open || (ride.lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) continue; diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index d852df29fe..a8abcc529b 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -636,7 +636,7 @@ constexpr RideTypeDescriptor kDummyRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(1, 00), RIDE_RATING(1, 00), RIDE_RATING(1, 00) }, + { MakeRideRating(1, 00), MakeRideRating(1, 00), MakeRideRating(1, 00) }, 1, -1, false, diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index e291022b9a..4572843d62 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -1701,27 +1701,27 @@ static RatingTuple ride_ratings_get_gforce_ratings(const Ride& ride) // Apply maximum negative G force factor fixed16_2dp gforce = ride.max_negative_vertical_g; - result.excitement += (std::clamp(gforce, -FIXED_2DP(2, 50), FIXED_2DP(0, 00)) * -15728) >> 16; - result.intensity += ((gforce - FIXED_2DP(1, 00)) * -52428) >> 16; - result.nausea += ((gforce - FIXED_2DP(1, 00)) * -14563) >> 16; + result.excitement += (std::clamp(gforce, -MakeRideRating(2, 50), MakeRideRating(0, 00)) * -15728) >> 16; + result.intensity += ((gforce - MakeRideRating(1, 00)) * -52428) >> 16; + result.nausea += ((gforce - MakeRideRating(1, 00)) * -14563) >> 16; // Apply lateral G force factor - result.excitement += (std::min(FIXED_2DP(1, 50), ride.max_lateral_g) * 26214) >> 16; + result.excitement += (std::min(MakeRideRating(1, 50), ride.max_lateral_g) * 26214) >> 16; result.intensity += ride.max_lateral_g; result.nausea += (ride.max_lateral_g * 21845) >> 16; // Very high lateral G force penalty #ifdef ORIGINAL_RATINGS - if (ride.max_lateral_g > FIXED_2DP(2, 80)) + if (ride.max_lateral_g > MakeFixed16_2dp(2, 80)) { - result.intensity += FIXED_2DP(3, 75); - result.nausea += FIXED_2DP(2, 00); + result.intensity += MakeRideRating(3, 75); + result.nausea += MakeRideRating(2, 00); } - if (ride.max_lateral_g > FIXED_2DP(3, 10)) + if (ride.max_lateral_g > MakeFixed16_2dp(3, 10)) { result.excitement /= 2; - result.intensity += FIXED_2DP(8, 50); - result.nausea += FIXED_2DP(4, 00); + result.intensity += MakeRideRating(8, 50); + result.nausea += MakeRideRating(4, 00); } #endif @@ -1983,11 +1983,11 @@ static void RideRatingsApplyBonusMotionSimulatorMode(RatingTuple& ratings, const // Hardcoded until ride mode refactor if (ride.mode == RideMode::FilmThrillRiders) { - RideRatingsSet(ratings, RIDE_RATING(3, 25), RIDE_RATING(4, 10), RIDE_RATING(3, 30)); + RideRatingsSet(ratings, MakeRideRating(3, 25), MakeRideRating(4, 10), MakeRideRating(3, 30)); } else { - RideRatingsSet(ratings, RIDE_RATING(2, 90), RIDE_RATING(3, 50), RIDE_RATING(3, 00)); + RideRatingsSet(ratings, MakeRideRating(2, 90), MakeRideRating(3, 50), MakeRideRating(3, 00)); } } @@ -1998,13 +1998,13 @@ static void RideRatingsApplyBonus3DCinemaMode(RatingTuple& ratings, const Ride& { default: case RideMode::MouseTails3DFilm: - RideRatingsSet(ratings, RIDE_RATING(3, 50), RIDE_RATING(2, 40), RIDE_RATING(1, 40)); + RideRatingsSet(ratings, MakeRideRating(3, 50), MakeRideRating(2, 40), MakeRideRating(1, 40)); break; case RideMode::StormChasers3DFilm: - RideRatingsSet(ratings, RIDE_RATING(4, 00), RIDE_RATING(2, 65), RIDE_RATING(1, 55)); + RideRatingsSet(ratings, MakeRideRating(4, 00), MakeRideRating(2, 65), MakeRideRating(1, 55)); break; case RideMode::SpaceRaiders3DFilm: - RideRatingsSet(ratings, RIDE_RATING(4, 20), RIDE_RATING(2, 60), RIDE_RATING(1, 48)); + RideRatingsSet(ratings, MakeRideRating(4, 20), MakeRideRating(2, 60), MakeRideRating(1, 48)); break; } } @@ -2016,13 +2016,13 @@ static void RideRatingsApplyBonusTopSpinMode(RatingTuple& ratings, const Ride& r { default: case RideMode::Beginners: - RideRatingsSet(ratings, RIDE_RATING(2, 00), RIDE_RATING(4, 80), RIDE_RATING(5, 74)); + RideRatingsSet(ratings, MakeRideRating(2, 00), MakeRideRating(4, 80), MakeRideRating(5, 74)); break; case RideMode::Intense: - RideRatingsSet(ratings, RIDE_RATING(3, 00), RIDE_RATING(5, 75), RIDE_RATING(6, 64)); + RideRatingsSet(ratings, MakeRideRating(3, 00), MakeRideRating(5, 75), MakeRideRating(6, 64)); break; case RideMode::Berserk: - RideRatingsSet(ratings, RIDE_RATING(3, 20), RIDE_RATING(6, 80), RIDE_RATING(7, 94)); + RideRatingsSet(ratings, MakeRideRating(3, 20), MakeRideRating(6, 80), MakeRideRating(7, 94)); break; } } @@ -2229,29 +2229,29 @@ static void RideRatingsApplyRequirementSplashdown(RatingTuple& ratings, const Ri static RatingTuple ride_ratings_get_excessive_lateral_g_penalty(const Ride& ride) { RatingTuple result{}; - if (ride.max_lateral_g > FIXED_2DP(2, 80)) + if (ride.max_lateral_g > MakeFixed16_2dp(2, 80)) { - result.intensity = FIXED_2DP(3, 75); - result.nausea = FIXED_2DP(2, 00); + result.intensity = MakeRideRating(3, 75); + result.nausea = MakeRideRating(2, 00); } - if (ride.max_lateral_g > FIXED_2DP(3, 10)) + if (ride.max_lateral_g > MakeFixed16_2dp(3, 10)) { // Remove half of the ride_ratings_get_gforce_ratings result.excitement = (ride.max_positive_vertical_g * 5242) >> 16; // Apply maximum negative G force factor fixed16_2dp gforce = ride.max_negative_vertical_g; - result.excitement += (std::clamp(gforce, -FIXED_2DP(2, 50), FIXED_2DP(0, 00)) * -15728) >> 16; + result.excitement += (std::clamp(gforce, -MakeRideRating(2, 50), MakeRideRating(0, 00)) * -15728) >> 16; // Apply lateral G force factor - result.excitement += (std::min(FIXED_2DP(1, 50), ride.max_lateral_g) * 26214) >> 16; + result.excitement += (std::min(MakeRideRating(1, 50), ride.max_lateral_g) * 26214) >> 16; // Remove half of the ride_ratings_get_gforce_ratings result.excitement /= 2; result.excitement *= -1; - result.intensity = FIXED_2DP(12, 25); - result.nausea = FIXED_2DP(6, 00); + result.intensity = MakeRideRating(12, 25); + result.nausea = MakeRideRating(6, 00); } return result; } diff --git a/src/openrct2/ride/RideRatings.h b/src/openrct2/ride/RideRatings.h index 4fac7b9542..9bf582d58b 100644 --- a/src/openrct2/ride/RideRatings.h +++ b/src/openrct2/ride/RideRatings.h @@ -21,8 +21,11 @@ namespace OpenRCT2 } // Convenience function for writing ride ratings. The result is a 16 bit signed -// integer. To create the ride rating 3.65 type RIDE_RATING(3,65) -#define RIDE_RATING(whole, fraction) FIXED_2DP(whole, fraction) +// integer. To create the ride rating 3.65 type MakeRideRating(3, 65). +constexpr ride_rating MakeRideRating(int16_t whole, uint8_t fraction) +{ + return MakeFixed2dp(whole, fraction); +} constexpr ride_rating kRideRatingUndefined = 0xFFFFu; #pragma pack(push, 1) diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 06b5676a10..a64a50a550 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -2358,8 +2358,8 @@ static void test_reset(Ride& ride, StationIndex curStation) ride.average_speed = 0; ride.current_test_segment = 0; ride.average_speed_test_timeout = 0; - ride.max_positive_vertical_g = FIXED_2DP(1, 0); - ride.max_negative_vertical_g = FIXED_2DP(1, 0); + ride.max_positive_vertical_g = MakeFixed16_2dp(1, 0); + ride.max_negative_vertical_g = MakeFixed16_2dp(1, 0); ride.max_lateral_g = 0; ride.previous_vertical_g = 0; ride.previous_lateral_g = 0; diff --git a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h index 5b6f971768..8e8d66de79 100644 --- a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h +++ b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h @@ -57,13 +57,13 @@ constexpr RideTypeDescriptor AirPoweredVerticalCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(4, 13), RIDE_RATING(2, 50), RIDE_RATING(2, 80) }, + { MakeRideRating(4, 13), MakeRideRating(2, 50), MakeRideRating(2, 80) }, 28, -1, false, { { RatingsModifierType::BonusLength, 6000, 327, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 60), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 60), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 509724, 364088, 320398 }, { RatingsModifierType::BonusGForces, 0, 24576, 35746, 59578 }, { RatingsModifierType::BonusSheltered, 0, 15420, 21845, 11702 }, diff --git a/src/openrct2/ride/rtd/coaster/AlpineCoaster.h b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h index b90c15c459..5f01240ac9 100644 --- a/src/openrct2/ride/rtd/coaster/AlpineCoaster.h +++ b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h @@ -56,13 +56,13 @@ constexpr RideTypeDescriptor AlpineCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 30), RIDE_RATING(2, 10), RIDE_RATING(1, 4) }, + { MakeRideRating(2, 30), MakeRideRating(2, 10), MakeRideRating(1, 4) }, 7, -1, false, { { RatingsModifierType::BonusLength, 6000, 873, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 75), RIDE_RATING(0, 5), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 75), MakeRideRating(0, 5), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h b/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h index ff3e35597a..4f4928041e 100644 --- a/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h +++ b/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h @@ -56,13 +56,13 @@ constexpr RideTypeDescriptor BobsleighCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 80), RIDE_RATING(3, 20), RIDE_RATING(2, 50) }, + { MakeRideRating(2, 80), MakeRideRating(3, 20), MakeRideRating(2, 50) }, 16, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 20), RIDE_RATING(0, 00), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 20), MakeRideRating(0, 00), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -74,7 +74,7 @@ constexpr RideTypeDescriptor BobsleighCoasterRTD = { RatingsModifierType::BonusProximity, 0, 20130, 0, 0 }, { RatingsModifierType::BonusScenery, 0, 5577, 0, 0 }, { RatingsModifierType::RequirementMaxSpeed, 0xC0000, 2, 2, 2 }, - { RatingsModifierType::RequirementLateralGs, FIXED_2DP(1, 20), 2, 2, 2 }, + { RatingsModifierType::RequirementLateralGs, MakeFixed16_2dp(1, 20), 2, 2, 2 }, { RatingsModifierType::RequirementLength, 0x1720000, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 65536, 23831, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h index 787136a684..449c4cba49 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h @@ -59,13 +59,13 @@ constexpr RideTypeDescriptor ClassicMiniRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 40), RIDE_RATING(2, 80), RIDE_RATING(1, 90) }, + { MakeRideRating(2, 40), MakeRideRating(2, 80), MakeRideRating(1, 90) }, 13, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h index 79d3f32064..e999ae3f5e 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h @@ -59,13 +59,13 @@ constexpr RideTypeDescriptor ClassicStandUpRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 50), RIDE_RATING(3, 00), RIDE_RATING(3, 00) }, + { MakeRideRating(2, 50), MakeRideRating(3, 00), MakeRideRating(3, 00) }, 17, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 10), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 10), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 123987, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -79,7 +79,7 @@ constexpr RideTypeDescriptor ClassicStandUpRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 5577, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 12, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 50), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 50), 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 35746, 59578 }, }, }, diff --git a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h index f09475c7af..01a7671c0e 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h @@ -57,13 +57,13 @@ constexpr RideTypeDescriptor ClassicWoodenRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 80), RIDE_RATING(2, 60), RIDE_RATING(2, 00) }, + { MakeRideRating(2, 80), MakeRideRating(2, 60), MakeRideRating(2, 00) }, 19, -1, false, { { RatingsModifierType::BonusLength, 6000, 873, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 655360, 0 }, @@ -77,7 +77,7 @@ constexpr RideTypeDescriptor ClassicWoodenRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 11155, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 12, 2, 1, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 1, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 10), 2, 1, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 10), 2, 1, 2 }, { RatingsModifierType::RequirementLength, 0x1720000, 2, 1, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 1, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 40960, 34555, 49648 }, diff --git a/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h index 8f68bfe4da..f2979cd203 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h @@ -59,13 +59,13 @@ constexpr RideTypeDescriptor ClassicWoodenTwisterRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 20), RIDE_RATING(2, 60), RIDE_RATING(2, 00) }, + { MakeRideRating(3, 20), MakeRideRating(2, 60), MakeRideRating(2, 00) }, 19, -1, false, { { RatingsModifierType::BonusLength, 6000, 873, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 655360, 0 }, @@ -79,7 +79,7 @@ constexpr RideTypeDescriptor ClassicWoodenTwisterRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 11155, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 12, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 10), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 10), 2, 2, 2 }, { RatingsModifierType::RequirementLength, 0x1720000, 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 40960, 34555, 49648 }, diff --git a/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h b/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h index 47e9959a63..3a009011df 100644 --- a/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h +++ b/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h @@ -57,13 +57,13 @@ constexpr RideTypeDescriptor CompactInvertedCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 15), RIDE_RATING(2, 80), RIDE_RATING(3, 20) }, + { MakeRideRating(3, 15), MakeRideRating(2, 80), MakeRideRating(3, 20) }, 21, -1, true, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 42), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 42), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -76,7 +76,7 @@ constexpr RideTypeDescriptor CompactInvertedCoasterRTD = { RatingsModifierType::BonusScenery, 0, 8366, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 12, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 30), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 30), 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 30980, 55606 }, }, }, diff --git a/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h b/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h index a89b1a7532..62210ad36b 100644 --- a/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h @@ -59,13 +59,13 @@ constexpr RideTypeDescriptor CorkscrewRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 00), RIDE_RATING(0, 50), RIDE_RATING(0, 20) }, + { MakeRideRating(3, 00), MakeRideRating(0, 50), MakeRideRating(0, 20) }, 16, -1, true, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -79,7 +79,7 @@ constexpr RideTypeDescriptor CorkscrewRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 12, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 35746, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h b/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h index 5a0f53f739..d61f2e88e1 100644 --- a/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h @@ -68,13 +68,13 @@ constexpr RideTypeDescriptor FlyingRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(4, 35), RIDE_RATING(1, 85), RIDE_RATING(4, 33) }, + { MakeRideRating(4, 35), MakeRideRating(1, 85), MakeRideRating(4, 33) }, 17, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -87,7 +87,7 @@ constexpr RideTypeDescriptor FlyingRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementInversions, 1, 2, 1, 1 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 1, 1 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 1, 1 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 1, 1 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 1, 1 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 38130, 49648 }, }, @@ -139,13 +139,13 @@ constexpr RideTypeDescriptor FlyingRollerCoasterAltRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(4, 35), RIDE_RATING(1, 85), RIDE_RATING(4, 33) }, + { MakeRideRating(4, 35), MakeRideRating(1, 85), MakeRideRating(4, 33) }, 17, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -158,7 +158,7 @@ constexpr RideTypeDescriptor FlyingRollerCoasterAltRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementInversions, 1, 2, 1, 1 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 1, 1 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 1, 1 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 1, 1 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 1, 1 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 38130, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/GigaCoaster.h b/src/openrct2/ride/rtd/coaster/GigaCoaster.h index c03f9b9f33..7e3e5b9080 100644 --- a/src/openrct2/ride/rtd/coaster/GigaCoaster.h +++ b/src/openrct2/ride/rtd/coaster/GigaCoaster.h @@ -61,13 +61,13 @@ constexpr RideTypeDescriptor GigaCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 85), RIDE_RATING(0, 40), RIDE_RATING(0, 35) }, + { MakeRideRating(3, 85), MakeRideRating(0, 40), MakeRideRating(0, 35) }, 14, -1, false, { { RatingsModifierType::BonusLength, 6000, 819, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 140434, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 51366, 85019, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 400497, 0 }, @@ -81,7 +81,7 @@ constexpr RideTypeDescriptor GigaCoasterRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 16, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 36864, 30384, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h index 55fd77460d..5135b8da94 100644 --- a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h +++ b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h @@ -58,13 +58,13 @@ constexpr RideTypeDescriptor HeartlineTwisterCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 00), RIDE_RATING(1, 70), RIDE_RATING(1, 65) }, + { MakeRideRating(3, 00), MakeRideRating(1, 70), MakeRideRating(1, 65) }, 18, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 20), RIDE_RATING(0, 04), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 20), MakeRideRating(0, 04), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 97418, 123987, 70849 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/coaster/HybridCoaster.h b/src/openrct2/ride/rtd/coaster/HybridCoaster.h index 34dfb7dde1..3b7c538385 100644 --- a/src/openrct2/ride/rtd/coaster/HybridCoaster.h +++ b/src/openrct2/ride/rtd/coaster/HybridCoaster.h @@ -62,13 +62,13 @@ constexpr RideTypeDescriptor HybridCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 80), RIDE_RATING(1, 00), RIDE_RATING(0, 45) }, + { MakeRideRating(3, 80), MakeRideRating(1, 00), MakeRideRating(0, 45) }, 16, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 400497, 0 }, @@ -82,7 +82,7 @@ constexpr RideTypeDescriptor HybridCoasterRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 14, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 35746, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/HyperTwister.h b/src/openrct2/ride/rtd/coaster/HyperTwister.h index cec3f8fcb6..6b6b25b6d9 100644 --- a/src/openrct2/ride/rtd/coaster/HyperTwister.h +++ b/src/openrct2/ride/rtd/coaster/HyperTwister.h @@ -63,13 +63,13 @@ constexpr RideTypeDescriptor HyperTwisterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 50), RIDE_RATING(0, 40), RIDE_RATING(0, 30) }, + { MakeRideRating(3, 50), MakeRideRating(0, 40), MakeRideRating(0, 30) }, 15, -1, true, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -83,7 +83,7 @@ constexpr RideTypeDescriptor HyperTwisterRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 12, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 32768, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/Hypercoaster.h b/src/openrct2/ride/rtd/coaster/Hypercoaster.h index f29c3179b2..0f0a8cc76b 100644 --- a/src/openrct2/ride/rtd/coaster/Hypercoaster.h +++ b/src/openrct2/ride/rtd/coaster/Hypercoaster.h @@ -62,13 +62,13 @@ constexpr RideTypeDescriptor HypercoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 00), RIDE_RATING(0, 50), RIDE_RATING(0, 20) }, + { MakeRideRating(3, 00), MakeRideRating(0, 50), MakeRideRating(0, 20) }, 16, -1, true, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -82,7 +82,7 @@ constexpr RideTypeDescriptor HypercoasterRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 12, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 35746, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h index 971b9b37b9..afd2753b39 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h @@ -55,13 +55,13 @@ constexpr RideTypeDescriptor InvertedHairpinCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 00), RIDE_RATING(2, 65), RIDE_RATING(2, 25) }, + { MakeRideRating(3, 00), MakeRideRating(2, 65), MakeRideRating(2, 25) }, 14, -1, false, { { RatingsModifierType::BonusLength, 6000, 873, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 8), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 8), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 655360, 0 }, @@ -74,8 +74,8 @@ constexpr RideTypeDescriptor InvertedHairpinCoasterRTD = { RatingsModifierType::BonusScenery, 0, 5577, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 8, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0x70000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 10), 2, 2, 2 }, - { RatingsModifierType::RequirementLateralGs, FIXED_2DP(1, 50), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 10), 2, 2, 2 }, + { RatingsModifierType::RequirementLateralGs, MakeFixed16_2dp(1, 50), 2, 2, 2 }, { RatingsModifierType::RequirementLength, 0xAA0000, 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 3, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 102400, 35746, 49648 }, diff --git a/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h index a8d79c0774..e41c38be60 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h @@ -60,13 +60,13 @@ constexpr RideTypeDescriptor InvertedImpulseCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(4, 00), RIDE_RATING(3, 00), RIDE_RATING(3, 20) }, + { MakeRideRating(4, 00), MakeRideRating(3, 00), MakeRideRating(3, 20) }, 20, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 42), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 42), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h index eef22f0c39..488eac38e8 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h @@ -64,13 +64,13 @@ constexpr RideTypeDescriptor InvertedRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 60), RIDE_RATING(2, 80), RIDE_RATING(3, 20) }, + { MakeRideRating(3, 60), MakeRideRating(2, 80), MakeRideRating(3, 20) }, 17, -1, true, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 42), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 42), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -84,7 +84,7 @@ constexpr RideTypeDescriptor InvertedRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 8366, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 12, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 30), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 30), 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 29789, 55606 }, }, }, diff --git a/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h b/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h index b87ca581c2..96fc7e9a0e 100644 --- a/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h @@ -60,13 +60,13 @@ constexpr RideTypeDescriptor JuniorRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 40), RIDE_RATING(2, 50), RIDE_RATING(1, 80) }, + { MakeRideRating(2, 40), MakeRideRating(2, 50), MakeRideRating(1, 80) }, 13, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h index 52998a013e..8103a66949 100644 --- a/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h @@ -61,13 +61,13 @@ constexpr RideTypeDescriptor LIMLaunchedRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 90), RIDE_RATING(1, 50), RIDE_RATING(2, 20) }, + { MakeRideRating(2, 90), MakeRideRating(1, 50), MakeRideRating(2, 20) }, 25, -1, true, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h index 9b99d025cd..19479f8e98 100644 --- a/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h @@ -60,13 +60,13 @@ constexpr RideTypeDescriptor LSMLaunchedRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 85), RIDE_RATING(0, 40), RIDE_RATING(0, 35) }, + { MakeRideRating(3, 85), MakeRideRating(0, 40), MakeRideRating(0, 35) }, 14, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h index af4f63e0b9..32de0de9a7 100644 --- a/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h @@ -67,13 +67,13 @@ constexpr RideTypeDescriptor LayDownRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 85), RIDE_RATING(1, 15), RIDE_RATING(2, 75) }, + { MakeRideRating(3, 85), MakeRideRating(1, 15), MakeRideRating(2, 75) }, 18, -1, true, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -86,7 +86,7 @@ constexpr RideTypeDescriptor LayDownRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementInversions, 1, 4, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 38130, 49648 }, }, @@ -138,13 +138,13 @@ constexpr RideTypeDescriptor LayDownRollerCoasterAltRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 85), RIDE_RATING(1, 15), RIDE_RATING(2, 75) }, + { MakeRideRating(3, 85), MakeRideRating(1, 15), MakeRideRating(2, 75) }, 18, -1, true, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -157,7 +157,7 @@ constexpr RideTypeDescriptor LayDownRollerCoasterAltRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementInversions, 1, 4, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 38130, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h index d4aeaf40e0..4050f1239a 100644 --- a/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h @@ -63,13 +63,13 @@ constexpr RideTypeDescriptor LoopingRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 00), RIDE_RATING(0, 50), RIDE_RATING(0, 20) }, + { MakeRideRating(3, 00), MakeRideRating(0, 50), MakeRideRating(0, 20) }, 15, -1, true, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -83,7 +83,7 @@ constexpr RideTypeDescriptor LoopingRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 14, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 10), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 10), 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 35746, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/MineRide.h b/src/openrct2/ride/rtd/coaster/MineRide.h index 3071e4bf52..d1fa8c2583 100644 --- a/src/openrct2/ride/rtd/coaster/MineRide.h +++ b/src/openrct2/ride/rtd/coaster/MineRide.h @@ -54,13 +54,13 @@ constexpr RideTypeDescriptor MineRideRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 75), RIDE_RATING(1, 00), RIDE_RATING(1, 80) }, + { MakeRideRating(2, 75), MakeRideRating(1, 00), MakeRideRating(1, 80) }, 16, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h index 94bd03b704..6c66047200 100644 --- a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h @@ -55,13 +55,13 @@ constexpr RideTypeDescriptor MineTrainCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 90), RIDE_RATING(2, 30), RIDE_RATING(2, 10) }, + { MakeRideRating(2, 90), MakeRideRating(2, 30), MakeRideRating(2, 10) }, 16, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -75,7 +75,7 @@ constexpr RideTypeDescriptor MineTrainCoasterRTD = { RatingsModifierType::BonusScenery, 0, 16732, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 8, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 10), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 10), 2, 2, 2 }, { RatingsModifierType::RequirementLength, 0x1720000, 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 40960, 35746, 49648 }, diff --git a/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h b/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h index f659106cd9..cb7667f359 100644 --- a/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h @@ -57,13 +57,13 @@ constexpr RideTypeDescriptor MiniRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 55), RIDE_RATING(2, 40), RIDE_RATING(1, 85) }, + { MakeRideRating(2, 55), MakeRideRating(2, 40), MakeRideRating(1, 85) }, 13, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -77,7 +77,7 @@ constexpr RideTypeDescriptor MiniRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 9760, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 12, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0x70000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 50), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 50), 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 20480, 23831, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h b/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h index a7ee4ce4b7..85185096c1 100644 --- a/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h @@ -54,13 +54,13 @@ constexpr RideTypeDescriptor MiniSuspendedCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 80), RIDE_RATING(2, 50), RIDE_RATING(2, 70) }, + { MakeRideRating(2, 80), MakeRideRating(2, 50), MakeRideRating(2, 70) }, 15, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 45), RIDE_RATING(0, 15), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 45), MakeRideRating(0, 15), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -73,7 +73,7 @@ constexpr RideTypeDescriptor MiniSuspendedCoasterRTD = { RatingsModifierType::BonusScenery, 0, 13943, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 6, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0x80000, 2, 2, 2 }, - { RatingsModifierType::RequirementLateralGs, FIXED_2DP(1, 30), 2, 2, 2 }, + { RatingsModifierType::RequirementLateralGs, MakeFixed16_2dp(1, 30), 2, 2, 2 }, { RatingsModifierType::RequirementLength, 0xC80000, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 35746, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h b/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h index 9989322af3..b7baa12248 100644 --- a/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h @@ -67,13 +67,13 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 75), RIDE_RATING(1, 95), RIDE_RATING(4, 79) }, + { MakeRideRating(3, 75), MakeRideRating(1, 95), MakeRideRating(4, 79) }, 18, -1, true, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -86,7 +86,7 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementInversions, 1, 4, 1, 1 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 1, 1 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 1, 1 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 1, 1 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 1, 1 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 38130, 49648 }, }, @@ -138,13 +138,13 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterAltRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 75), RIDE_RATING(1, 95), RIDE_RATING(4, 79) }, + { MakeRideRating(3, 75), MakeRideRating(1, 95), MakeRideRating(4, 79) }, 18, -1, true, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -157,7 +157,7 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterAltRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementInversions, 1, 4, 1, 1 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 1, 1 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 1, 1 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 1, 1 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 1, 1 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 38130, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h index 1d39dbab3f..16ba4d4bd1 100644 --- a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h @@ -58,13 +58,13 @@ constexpr RideTypeDescriptor ReverseFreefallCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 00), RIDE_RATING(3, 20), RIDE_RATING(2, 80) }, + { MakeRideRating(2, 00), MakeRideRating(3, 20), MakeRideRating(2, 80) }, 25, -1, false, { { RatingsModifierType::BonusLength, 6000, 327, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 60), RIDE_RATING(0, 15), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 60), MakeRideRating(0, 15), 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 436906, 436906, 320398 }, { RatingsModifierType::BonusGForces, 0, 24576, 41704, 59578 }, { RatingsModifierType::BonusSheltered, 0, 12850, 28398, 11702 }, diff --git a/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h index 8215f4f332..2c44f77699 100644 --- a/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h @@ -54,17 +54,17 @@ constexpr RideTypeDescriptor ReverserRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 40), RIDE_RATING(1, 80), RIDE_RATING(1, 70) }, + { MakeRideRating(2, 40), MakeRideRating(1, 80), MakeRideRating(1, 70) }, 19, -1, false, { { RatingsModifierType::BonusLength, 6000, 873, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 655360, 0 }, - { RatingsModifierType::BonusReversals, 6, RIDE_RATING(0, 20), RIDE_RATING(0, 20), RIDE_RATING(0, 20) }, + { RatingsModifierType::BonusReversals, 6, MakeRideRating(0, 20), MakeRideRating(0, 20), MakeRideRating(0, 20) }, { RatingsModifierType::BonusDuration, 150, 26214, 0, 0 }, { RatingsModifierType::BonusGForces, 0, 28672, 23831, 49648 }, { RatingsModifierType::BonusTurns, 0, 26749, 43458, 45749 }, diff --git a/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h index 2e98d49dc6..439d86b5ff 100644 --- a/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h @@ -56,13 +56,13 @@ constexpr RideTypeDescriptor SideFrictionRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 50), RIDE_RATING(2, 00), RIDE_RATING(1, 50) }, + { MakeRideRating(2, 50), MakeRideRating(2, 00), MakeRideRating(1, 50) }, 19, -1, false, { { RatingsModifierType::BonusLength, 6000, 873, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 655360, 0 }, diff --git a/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h index 60a3428130..d14326615a 100644 --- a/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h @@ -56,13 +56,13 @@ constexpr RideTypeDescriptor SingleRailRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 50), RIDE_RATING(0, 60), RIDE_RATING(0, 40) }, + { MakeRideRating(3, 50), MakeRideRating(0, 60), MakeRideRating(0, 40) }, 16, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 436906, 0 }, @@ -76,7 +76,7 @@ constexpr RideTypeDescriptor SingleRailRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 14, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 35746, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h index ad8cd72a2a..86e8d4b969 100644 --- a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h @@ -55,13 +55,13 @@ constexpr RideTypeDescriptor SpinningWildMouseRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 80), RIDE_RATING(2, 50), RIDE_RATING(2, 10) }, + { MakeRideRating(2, 80), MakeRideRating(2, 50), MakeRideRating(2, 10) }, 14, -1, false, { { RatingsModifierType::BonusLength, 6000, 873, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 8), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 8), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 655360, 0 }, @@ -74,7 +74,7 @@ constexpr RideTypeDescriptor SpinningWildMouseRTD = { RatingsModifierType::BonusScenery, 0, 5577, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 6, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0x70000, 2, 2, 2 }, - { RatingsModifierType::RequirementLateralGs, FIXED_2DP(1, 50), 2, 2, 2 }, + { RatingsModifierType::RequirementLateralGs, MakeFixed16_2dp(1, 50), 2, 2, 2 }, { RatingsModifierType::RequirementLength, 0xAA0000, 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 102400, 35746, 49648 }, diff --git a/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h index 30930b617a..5e72110c17 100644 --- a/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h @@ -57,13 +57,13 @@ constexpr RideTypeDescriptor SpiralRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 30), RIDE_RATING(0, 30), RIDE_RATING(0, 30) }, + { MakeRideRating(3, 30), MakeRideRating(0, 30), MakeRideRating(0, 30) }, 14, -1, false, { { RatingsModifierType::BonusLength, 6000, 819, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 140434, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 51366, 85019, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 400497, 0 }, @@ -76,7 +76,7 @@ constexpr RideTypeDescriptor SpiralRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 12, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 36864, 30384, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h b/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h index 5e5bf43e31..0c23c931ad 100644 --- a/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h @@ -59,13 +59,13 @@ constexpr RideTypeDescriptor StandUpRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 50), RIDE_RATING(3, 00), RIDE_RATING(3, 00) }, + { MakeRideRating(2, 50), MakeRideRating(3, 00), MakeRideRating(3, 00) }, 17, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 10), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 10), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 123987, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -79,7 +79,7 @@ constexpr RideTypeDescriptor StandUpRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 5577, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 12, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 50), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 50), 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 35746, 59578 }, }, }, diff --git a/src/openrct2/ride/rtd/coaster/SteelWildMouse.h b/src/openrct2/ride/rtd/coaster/SteelWildMouse.h index 9eb8118e56..2b085a41c0 100644 --- a/src/openrct2/ride/rtd/coaster/SteelWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/SteelWildMouse.h @@ -56,13 +56,13 @@ constexpr RideTypeDescriptor SteelWildMouseRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 80), RIDE_RATING(2, 50), RIDE_RATING(2, 10) }, + { MakeRideRating(2, 80), MakeRideRating(2, 50), MakeRideRating(2, 10) }, 14, -1, false, { { RatingsModifierType::BonusLength, 6000, 873, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 8), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 8), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 655360, 0 }, @@ -75,7 +75,7 @@ constexpr RideTypeDescriptor SteelWildMouseRTD = { RatingsModifierType::BonusScenery, 0, 5577, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 6, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0x70000, 2, 2, 2 }, - { RatingsModifierType::RequirementLateralGs, FIXED_2DP(1, 50), 2, 2, 2 }, + { RatingsModifierType::RequirementLateralGs, MakeFixed16_2dp(1, 50), 2, 2, 2 }, { RatingsModifierType::RequirementLength, 0xAA0000, 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 102400, 35746, 49648 }, diff --git a/src/openrct2/ride/rtd/coaster/Steeplechase.h b/src/openrct2/ride/rtd/coaster/Steeplechase.h index 5cf16c2a87..0f3c15a1de 100644 --- a/src/openrct2/ride/rtd/coaster/Steeplechase.h +++ b/src/openrct2/ride/rtd/coaster/Steeplechase.h @@ -58,13 +58,13 @@ constexpr RideTypeDescriptor SteeplechaseRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 70), RIDE_RATING(2, 40), RIDE_RATING(1, 80) }, + { MakeRideRating(2, 70), MakeRideRating(2, 40), MakeRideRating(1, 80) }, 14, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 75), RIDE_RATING(0, 9), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 75), MakeRideRating(0, 9), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -77,7 +77,7 @@ constexpr RideTypeDescriptor SteeplechaseRTD = { RatingsModifierType::BonusScenery, 0, 9760, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 4, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0x80000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 50), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 50), 2, 2, 2 }, { RatingsModifierType::RequirementLength, 0xF00000, 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 20480, 20852, 49648 }, diff --git a/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h b/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h index 242e5decb0..2dea134cd7 100644 --- a/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h @@ -55,13 +55,13 @@ constexpr RideTypeDescriptor SuspendedSwingingCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 30), RIDE_RATING(2, 90), RIDE_RATING(3, 50) }, + { MakeRideRating(3, 30), MakeRideRating(2, 90), MakeRideRating(3, 50) }, 18, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 10), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 10), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -74,8 +74,8 @@ constexpr RideTypeDescriptor SuspendedSwingingCoasterRTD = { RatingsModifierType::BonusScenery, 0, 6971, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 8, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xC0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 60), 2, 2, 2 }, - { RatingsModifierType::RequirementLateralGs, FIXED_2DP(1, 50), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 60), 2, 2, 2 }, + { RatingsModifierType::RequirementLateralGs, MakeFixed16_2dp(1, 50), 2, 2, 2 }, { RatingsModifierType::RequirementLength, 0x1720000, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 32768, 23831, 79437 }, }, diff --git a/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h b/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h index 7f6d1793f4..d27a4fad92 100644 --- a/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h @@ -63,13 +63,13 @@ constexpr RideTypeDescriptor TwisterRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 50), RIDE_RATING(0, 40), RIDE_RATING(0, 30) }, + { MakeRideRating(3, 50), MakeRideRating(0, 40), MakeRideRating(0, 30) }, 15, -1, true, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, @@ -83,7 +83,7 @@ constexpr RideTypeDescriptor TwisterRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 12, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 40), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 40), 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 24576, 32768, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h b/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h index fb54a92144..b01bc3bd8e 100644 --- a/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h +++ b/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h @@ -60,13 +60,13 @@ constexpr RideTypeDescriptor VerticalDropCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 20), RIDE_RATING(0, 80), RIDE_RATING(0, 30) }, + { MakeRideRating(3, 20), MakeRideRating(0, 80), MakeRideRating(0, 30) }, 16, -1, false, { { RatingsModifierType::BonusLength, 4000, 1146, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 97418, 141699, 70849 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, { RatingsModifierType::BonusDuration, 150, 26214, 0, 0 }, @@ -78,7 +78,7 @@ constexpr RideTypeDescriptor VerticalDropCoasterRTD = { RatingsModifierType::BonusScenery, 0, 6693, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 20, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 10), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 10), 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 1, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 40960, 35746, 49648 }, }, diff --git a/src/openrct2/ride/rtd/coaster/VirginiaReel.h b/src/openrct2/ride/rtd/coaster/VirginiaReel.h index 82b08ffcf5..24919fefa6 100644 --- a/src/openrct2/ride/rtd/coaster/VirginiaReel.h +++ b/src/openrct2/ride/rtd/coaster/VirginiaReel.h @@ -54,13 +54,13 @@ constexpr RideTypeDescriptor VirginiaReelRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 10), RIDE_RATING(1, 90), RIDE_RATING(3, 70) }, + { MakeRideRating(2, 10), MakeRideRating(1, 90), MakeRideRating(3, 70) }, 19, -1, false, { { RatingsModifierType::BonusLength, 6000, 873, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 655360, 0 }, diff --git a/src/openrct2/ride/rtd/coaster/WaterCoaster.h b/src/openrct2/ride/rtd/coaster/WaterCoaster.h index aa61b19d07..3a0b533968 100644 --- a/src/openrct2/ride/rtd/coaster/WaterCoaster.h +++ b/src/openrct2/ride/rtd/coaster/WaterCoaster.h @@ -72,13 +72,13 @@ constexpr RideTypeDescriptor WaterCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 70), RIDE_RATING(2, 80), RIDE_RATING(2, 10) }, + { MakeRideRating(2, 70), MakeRideRating(2, 80), MakeRideRating(2, 10) }, 14, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h index d5f04e249c..88577e052f 100644 --- a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h @@ -62,13 +62,13 @@ constexpr RideTypeDescriptor WoodenRollerCoasterRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(3, 20), RIDE_RATING(2, 60), RIDE_RATING(2, 00) }, + { MakeRideRating(3, 20), MakeRideRating(2, 60), MakeRideRating(2, 00) }, 19, -1, false, { { RatingsModifierType::BonusLength, 6000, 873, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 655360, 0 }, @@ -82,7 +82,7 @@ constexpr RideTypeDescriptor WoodenRollerCoasterRTD = { RatingsModifierType::BonusScenery, 0, 11155, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 12, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0xA0000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 10), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 10), 2, 2, 2 }, { RatingsModifierType::RequirementLength, 0x1720000, 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 2, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 40960, 34555, 49648 }, diff --git a/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h b/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h index 4d536689f4..94e7d2b05c 100644 --- a/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h @@ -55,13 +55,13 @@ constexpr RideTypeDescriptor WoodenWildMouseRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 90), RIDE_RATING(2, 90), RIDE_RATING(2, 10) }, + { MakeRideRating(2, 90), MakeRideRating(2, 90), MakeRideRating(2, 10) }, 14, -1, false, { { RatingsModifierType::BonusLength, 6000, 873, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 8), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 8), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 364088, 655360, 0 }, @@ -74,8 +74,8 @@ constexpr RideTypeDescriptor WoodenWildMouseRTD = { RatingsModifierType::BonusScenery, 0, 5577, 0, 0 }, { RatingsModifierType::RequirementDropHeight, 8, 2, 2, 2 }, { RatingsModifierType::RequirementMaxSpeed, 0x70000, 2, 2, 2 }, - { RatingsModifierType::RequirementNegativeGs, FIXED_2DP(0, 10), 2, 2, 2 }, - { RatingsModifierType::RequirementLateralGs, FIXED_2DP(1, 50), 2, 2, 2 }, + { RatingsModifierType::RequirementNegativeGs, MakeFixed16_2dp(0, 10), 2, 2, 2 }, + { RatingsModifierType::RequirementLateralGs, MakeFixed16_2dp(1, 50), 2, 2, 2 }, { RatingsModifierType::RequirementLength, 0xAA0000, 2, 2, 2 }, { RatingsModifierType::RequirementNumDrops, 3, 2, 2, 2 }, { RatingsModifierType::PenaltyLateralGs, 0, 102400, 35746, 49648 }, diff --git a/src/openrct2/ride/rtd/gentle/CarRide.h b/src/openrct2/ride/rtd/gentle/CarRide.h index 0c40818b8a..5f43c74ec5 100644 --- a/src/openrct2/ride/rtd/gentle/CarRide.h +++ b/src/openrct2/ride/rtd/gentle/CarRide.h @@ -65,13 +65,13 @@ constexpr RideTypeDescriptor CarRideRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 00), RIDE_RATING(0, 50), RIDE_RATING(0, 00) }, + { MakeRideRating(2, 00), MakeRideRating(0, 50), MakeRideRating(0, 00) }, 12, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 15), RIDE_RATING(0, 00), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 15), MakeRideRating(0, 00), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/gentle/Circus.h b/src/openrct2/ride/rtd/gentle/Circus.h index 79fc0c4c72..6e776a6cd3 100644 --- a/src/openrct2/ride/rtd/gentle/Circus.h +++ b/src/openrct2/ride/rtd/gentle/Circus.h @@ -52,7 +52,7 @@ constexpr RideTypeDescriptor CircusRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(2, 10), RIDE_RATING(0, 30), RIDE_RATING(0, 0) }, + { MakeRideRating(2, 10), MakeRideRating(0, 30), MakeRideRating(0, 0) }, 9, 7, false, diff --git a/src/openrct2/ride/rtd/gentle/CrookedHouse.h b/src/openrct2/ride/rtd/gentle/CrookedHouse.h index c2610b61e0..78e2262561 100644 --- a/src/openrct2/ride/rtd/gentle/CrookedHouse.h +++ b/src/openrct2/ride/rtd/gentle/CrookedHouse.h @@ -54,7 +54,7 @@ constexpr RideTypeDescriptor CrookedHouseRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(2, 15), RIDE_RATING(0, 62), RIDE_RATING(0, 34) }, + { MakeRideRating(2, 15), MakeRideRating(0, 62), MakeRideRating(0, 34) }, 5, 7, false, diff --git a/src/openrct2/ride/rtd/gentle/Dodgems.h b/src/openrct2/ride/rtd/gentle/Dodgems.h index aa1fc4dbed..4002f2c81e 100644 --- a/src/openrct2/ride/rtd/gentle/Dodgems.h +++ b/src/openrct2/ride/rtd/gentle/Dodgems.h @@ -60,14 +60,14 @@ constexpr RideTypeDescriptor DodgemsRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(1, 30), RIDE_RATING(0, 50), RIDE_RATING(0, 35) }, + { MakeRideRating(1, 30), MakeRideRating(0, 50), MakeRideRating(0, 35) }, 16, 7, false, { // Special case, passing -2 to represent division by 2 { RatingsModifierType::BonusOperationOption, 0, 1, -2, 0 }, - { RatingsModifierType::BonusNumTrains, 4, RIDE_RATING(0, 80), 0, 0 }, + { RatingsModifierType::BonusNumTrains, 4, MakeRideRating(0, 80), 0, 0 }, { RatingsModifierType::BonusScenery, 0, 5577, 0, 0 }, }, }, diff --git a/src/openrct2/ride/rtd/gentle/FerrisWheel.h b/src/openrct2/ride/rtd/gentle/FerrisWheel.h index 6e2f26757d..22323fb1bd 100644 --- a/src/openrct2/ride/rtd/gentle/FerrisWheel.h +++ b/src/openrct2/ride/rtd/gentle/FerrisWheel.h @@ -56,7 +56,7 @@ constexpr RideTypeDescriptor FerrisWheelRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(0, 60), RIDE_RATING(0, 25), RIDE_RATING(0, 30) }, + { MakeRideRating(0, 60), MakeRideRating(0, 25), MakeRideRating(0, 30) }, 16, 0, false, diff --git a/src/openrct2/ride/rtd/gentle/FlyingSaucers.h b/src/openrct2/ride/rtd/gentle/FlyingSaucers.h index 2acb43b24b..c2c28aa7fe 100644 --- a/src/openrct2/ride/rtd/gentle/FlyingSaucers.h +++ b/src/openrct2/ride/rtd/gentle/FlyingSaucers.h @@ -58,14 +58,14 @@ constexpr RideTypeDescriptor FlyingSaucersRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(2, 40), RIDE_RATING(0, 55), RIDE_RATING(0, 39) }, + { MakeRideRating(2, 40), MakeRideRating(0, 55), MakeRideRating(0, 39) }, 32, 0, false, { // Special case, passing -2 to represent division by 2 { RatingsModifierType::BonusOperationOption, 0, 1, -2, 0 }, - { RatingsModifierType::BonusNumTrains, 4, RIDE_RATING(0, 80), 0, 0 }, + { RatingsModifierType::BonusNumTrains, 4, MakeRideRating(0, 80), 0, 0 }, { RatingsModifierType::BonusScenery, 0, 5577, 0, 0 }, }, }, diff --git a/src/openrct2/ride/rtd/gentle/GhostTrain.h b/src/openrct2/ride/rtd/gentle/GhostTrain.h index f37d7037a8..5a7b077ef2 100644 --- a/src/openrct2/ride/rtd/gentle/GhostTrain.h +++ b/src/openrct2/ride/rtd/gentle/GhostTrain.h @@ -61,13 +61,13 @@ constexpr RideTypeDescriptor GhostTrainRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 00), RIDE_RATING(0, 20), RIDE_RATING(0, 03) }, + { MakeRideRating(2, 00), MakeRideRating(0, 20), MakeRideRating(0, 03) }, 12, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 15), RIDE_RATING(0, 00), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 15), MakeRideRating(0, 00), 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, { RatingsModifierType::BonusDuration, 150, 26214, 0, 0 }, diff --git a/src/openrct2/ride/rtd/gentle/HauntedHouse.h b/src/openrct2/ride/rtd/gentle/HauntedHouse.h index d4a6e3b7e6..02dde6c80e 100644 --- a/src/openrct2/ride/rtd/gentle/HauntedHouse.h +++ b/src/openrct2/ride/rtd/gentle/HauntedHouse.h @@ -52,7 +52,7 @@ constexpr RideTypeDescriptor HauntedHouseRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(3, 41), RIDE_RATING(1, 53), RIDE_RATING(0, 10) }, + { MakeRideRating(3, 41), MakeRideRating(1, 53), MakeRideRating(0, 10) }, 8, 7, false, diff --git a/src/openrct2/ride/rtd/gentle/Maze.h b/src/openrct2/ride/rtd/gentle/Maze.h index c75b179a43..05a614abf8 100644 --- a/src/openrct2/ride/rtd/gentle/Maze.h +++ b/src/openrct2/ride/rtd/gentle/Maze.h @@ -55,7 +55,7 @@ constexpr RideTypeDescriptor MazeRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(1, 30), RIDE_RATING(0, 50), RIDE_RATING(0, 00) }, + { MakeRideRating(1, 30), MakeRideRating(0, 50), MakeRideRating(0, 00) }, 8, 0, false, diff --git a/src/openrct2/ride/rtd/gentle/MerryGoRound.h b/src/openrct2/ride/rtd/gentle/MerryGoRound.h index 5452d8e7c7..c8e8afe57c 100644 --- a/src/openrct2/ride/rtd/gentle/MerryGoRound.h +++ b/src/openrct2/ride/rtd/gentle/MerryGoRound.h @@ -53,7 +53,7 @@ constexpr RideTypeDescriptor MerryGoRoundRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(0, 60), RIDE_RATING(0, 15), RIDE_RATING(0, 30) }, + { MakeRideRating(0, 60), MakeRideRating(0, 15), MakeRideRating(0, 30) }, 16, 7, false, diff --git a/src/openrct2/ride/rtd/gentle/MiniGolf.h b/src/openrct2/ride/rtd/gentle/MiniGolf.h index 2ddc5ca6bf..5448a7dbc1 100644 --- a/src/openrct2/ride/rtd/gentle/MiniGolf.h +++ b/src/openrct2/ride/rtd/gentle/MiniGolf.h @@ -54,7 +54,7 @@ constexpr RideTypeDescriptor MiniGolfRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(1, 50), RIDE_RATING(0, 90), RIDE_RATING(0, 00) }, + { MakeRideRating(1, 50), MakeRideRating(0, 90), MakeRideRating(0, 00) }, 0, -1, false, diff --git a/src/openrct2/ride/rtd/gentle/MiniHelicopters.h b/src/openrct2/ride/rtd/gentle/MiniHelicopters.h index 91821da270..6102a3f1b9 100644 --- a/src/openrct2/ride/rtd/gentle/MiniHelicopters.h +++ b/src/openrct2/ride/rtd/gentle/MiniHelicopters.h @@ -61,13 +61,13 @@ constexpr RideTypeDescriptor MiniHelicoptersRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(1, 60), RIDE_RATING(0, 40), RIDE_RATING(0, 00) }, + { MakeRideRating(1, 60), MakeRideRating(0, 40), MakeRideRating(0, 00) }, 12, 6, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 15), RIDE_RATING(0, 00), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 15), MakeRideRating(0, 00), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/gentle/MonorailCycles.h b/src/openrct2/ride/rtd/gentle/MonorailCycles.h index 8a20d4272f..9628cfd577 100644 --- a/src/openrct2/ride/rtd/gentle/MonorailCycles.h +++ b/src/openrct2/ride/rtd/gentle/MonorailCycles.h @@ -57,13 +57,13 @@ constexpr RideTypeDescriptor MonorailCyclesRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(1, 40), RIDE_RATING(0, 20), RIDE_RATING(0, 00) }, + { MakeRideRating(1, 40), MakeRideRating(0, 20), MakeRideRating(0, 00) }, 4, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 15), RIDE_RATING(0, 00), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 15), MakeRideRating(0, 00), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h index 640121d46a..3f36e077ac 100644 --- a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h +++ b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h @@ -60,13 +60,13 @@ constexpr RideTypeDescriptor MonsterTrucksRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 00), RIDE_RATING(0, 50), RIDE_RATING(0, 00) }, + { MakeRideRating(2, 00), MakeRideRating(0, 50), MakeRideRating(0, 00) }, 12, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 15), RIDE_RATING(0, 00), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 15), MakeRideRating(0, 00), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/gentle/ObservationTower.h b/src/openrct2/ride/rtd/gentle/ObservationTower.h index 76910c96ac..e17ee2ba84 100644 --- a/src/openrct2/ride/rtd/gentle/ObservationTower.h +++ b/src/openrct2/ride/rtd/gentle/ObservationTower.h @@ -56,7 +56,7 @@ constexpr RideTypeDescriptor ObservationTowerRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(1, 50), RIDE_RATING(0, 00), RIDE_RATING(0, 10) }, + { MakeRideRating(1, 50), MakeRideRating(0, 00), MakeRideRating(0, 10) }, 15, 7, false, diff --git a/src/openrct2/ride/rtd/gentle/SpaceRings.h b/src/openrct2/ride/rtd/gentle/SpaceRings.h index 6a386e1b30..fd688eab90 100644 --- a/src/openrct2/ride/rtd/gentle/SpaceRings.h +++ b/src/openrct2/ride/rtd/gentle/SpaceRings.h @@ -51,7 +51,7 @@ constexpr RideTypeDescriptor SpaceRingsRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(1, 50), RIDE_RATING(2, 10), RIDE_RATING(6, 50) }, + { MakeRideRating(1, 50), MakeRideRating(2, 10), MakeRideRating(6, 50) }, 7, 0, false, diff --git a/src/openrct2/ride/rtd/gentle/SpiralSlide.h b/src/openrct2/ride/rtd/gentle/SpiralSlide.h index 03d72f6346..b08a3b0118 100644 --- a/src/openrct2/ride/rtd/gentle/SpiralSlide.h +++ b/src/openrct2/ride/rtd/gentle/SpiralSlide.h @@ -58,12 +58,12 @@ constexpr RideTypeDescriptor SpiralSlideRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(1, 50), RIDE_RATING(1, 40), RIDE_RATING(0, 90) }, + { MakeRideRating(1, 50), MakeRideRating(1, 40), MakeRideRating(0, 90) }, 8, 2, false, { - { RatingsModifierType::BonusSlideUnlimitedRides, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 20), RIDE_RATING(0, 25) }, + { RatingsModifierType::BonusSlideUnlimitedRides, 0, MakeRideRating(0, 40), MakeRideRating(0, 20), MakeRideRating(0, 25) }, { RatingsModifierType::BonusScenery, 0, 25098, 0, 0 }, }, }, diff --git a/src/openrct2/ride/rtd/thrill/Enterprise.h b/src/openrct2/ride/rtd/thrill/Enterprise.h index 106dadcb37..bfc2b2ce60 100644 --- a/src/openrct2/ride/rtd/thrill/Enterprise.h +++ b/src/openrct2/ride/rtd/thrill/Enterprise.h @@ -52,7 +52,7 @@ constexpr RideTypeDescriptor EnterpriseRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(3, 60), RIDE_RATING(4, 55), RIDE_RATING(5, 72) }, + { MakeRideRating(3, 60), MakeRideRating(4, 55), MakeRideRating(5, 72) }, 22, 3, false, diff --git a/src/openrct2/ride/rtd/thrill/GoKarts.h b/src/openrct2/ride/rtd/thrill/GoKarts.h index 93d6389e9e..dc752f66ff 100644 --- a/src/openrct2/ride/rtd/thrill/GoKarts.h +++ b/src/openrct2/ride/rtd/thrill/GoKarts.h @@ -58,13 +58,13 @@ constexpr RideTypeDescriptor GoKartsRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(1, 42), RIDE_RATING(1, 73), RIDE_RATING(0, 40) }, + { MakeRideRating(1, 42), MakeRideRating(1, 73), MakeRideRating(0, 40) }, 16, -1, false, { { RatingsModifierType::BonusLength, 700, 32768, 0, 0 }, - { RatingsModifierType::BonusGoKartRace, 4, RIDE_RATING(1, 40), RIDE_RATING(0, 50), 0 }, + { RatingsModifierType::BonusGoKartRace, 4, MakeRideRating(1, 40), MakeRideRating(0, 50), 0 }, { RatingsModifierType::BonusTurns, 0, 4458, 3476, 5718 }, { RatingsModifierType::BonusDrops, 0, 8738, 5461, 6553 }, { RatingsModifierType::BonusSheltered, 0, 2570, 8738, 2340 }, diff --git a/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h b/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h index c6811de052..2d2c2a69ba 100644 --- a/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h +++ b/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h @@ -55,12 +55,12 @@ constexpr RideTypeDescriptor LaunchedFreefallRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 70), RIDE_RATING(3, 00), RIDE_RATING(3, 50) }, + { MakeRideRating(2, 70), MakeRideRating(3, 00), MakeRideRating(3, 50) }, 16, -1, false, { - { RatingsModifierType::BonusDownwardLaunch, 0, RIDE_RATING(0, 30), RIDE_RATING(0, 65), RIDE_RATING(0, 45) }, + { RatingsModifierType::BonusDownwardLaunch, 0, MakeRideRating(0, 30), MakeRideRating(0, 65), MakeRideRating(0, 45) }, { RatingsModifierType::BonusLaunchedFreefallSpecial, 0, 0, 1355917, 451972 }, { RatingsModifierType::BonusProximity, 0, 20130, 0, 0 }, { RatingsModifierType::BonusScenery, 0, 25098, 0, 0 }, diff --git a/src/openrct2/ride/rtd/thrill/MagicCarpet.h b/src/openrct2/ride/rtd/thrill/MagicCarpet.h index ba2694e7b0..1b8a5263e2 100644 --- a/src/openrct2/ride/rtd/thrill/MagicCarpet.h +++ b/src/openrct2/ride/rtd/thrill/MagicCarpet.h @@ -57,7 +57,7 @@ constexpr RideTypeDescriptor MagicCarpetRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(2, 45), RIDE_RATING(1, 60), RIDE_RATING(2, 60) }, + { MakeRideRating(2, 45), MakeRideRating(1, 60), MakeRideRating(2, 60) }, 16, 0, false, diff --git a/src/openrct2/ride/rtd/thrill/RotoDrop.h b/src/openrct2/ride/rtd/thrill/RotoDrop.h index 424d749af2..9fd296d8aa 100644 --- a/src/openrct2/ride/rtd/thrill/RotoDrop.h +++ b/src/openrct2/ride/rtd/thrill/RotoDrop.h @@ -55,7 +55,7 @@ constexpr RideTypeDescriptor RotoDropRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 80), RIDE_RATING(3, 50), RIDE_RATING(3, 50) }, + { MakeRideRating(2, 80), MakeRideRating(3, 50), MakeRideRating(3, 50) }, 24, -1, false, diff --git a/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h b/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h index 95c59ef8f0..d7b7c395a1 100644 --- a/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h +++ b/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h @@ -56,7 +56,7 @@ constexpr RideTypeDescriptor SwingingInverterShipRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(2, 50), RIDE_RATING(2, 70), RIDE_RATING(2, 74) }, + { MakeRideRating(2, 50), MakeRideRating(2, 70), MakeRideRating(2, 74) }, 16, 0, false, diff --git a/src/openrct2/ride/rtd/thrill/SwingingShip.h b/src/openrct2/ride/rtd/thrill/SwingingShip.h index 62cb6548af..395d7ac58b 100644 --- a/src/openrct2/ride/rtd/thrill/SwingingShip.h +++ b/src/openrct2/ride/rtd/thrill/SwingingShip.h @@ -56,7 +56,7 @@ constexpr RideTypeDescriptor SwingingShipRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(1, 50), RIDE_RATING(1, 90), RIDE_RATING(1, 41) }, + { MakeRideRating(1, 50), MakeRideRating(1, 90), MakeRideRating(1, 41) }, 10, 0, false, diff --git a/src/openrct2/ride/rtd/thrill/Twist.h b/src/openrct2/ride/rtd/thrill/Twist.h index 36c171c038..020c5c699f 100644 --- a/src/openrct2/ride/rtd/thrill/Twist.h +++ b/src/openrct2/ride/rtd/thrill/Twist.h @@ -51,7 +51,7 @@ constexpr RideTypeDescriptor TwistRTD = .RatingsData = { RatingsCalculationType::FlatRide, - { RIDE_RATING(1, 13), RIDE_RATING(0, 97), RIDE_RATING(1, 90) }, + { MakeRideRating(1, 13), MakeRideRating(0, 97), MakeRideRating(1, 90) }, 16, 0, false, diff --git a/src/openrct2/ride/rtd/transport/Chairlift.h b/src/openrct2/ride/rtd/transport/Chairlift.h index a785b6289c..76a3f154cf 100644 --- a/src/openrct2/ride/rtd/transport/Chairlift.h +++ b/src/openrct2/ride/rtd/transport/Chairlift.h @@ -59,7 +59,7 @@ constexpr RideTypeDescriptor ChairliftRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(1, 60), RIDE_RATING(0, 40), RIDE_RATING(0, 50) }, + { MakeRideRating(1, 60), MakeRideRating(0, 40), MakeRideRating(0, 50) }, 14, -1, false, diff --git a/src/openrct2/ride/rtd/transport/Lift.h b/src/openrct2/ride/rtd/transport/Lift.h index 21404b06d9..d97dfe517a 100644 --- a/src/openrct2/ride/rtd/transport/Lift.h +++ b/src/openrct2/ride/rtd/transport/Lift.h @@ -55,7 +55,7 @@ constexpr RideTypeDescriptor LiftRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(1, 11), RIDE_RATING(0, 35), RIDE_RATING(0, 30) }, + { MakeRideRating(1, 11), MakeRideRating(0, 35), MakeRideRating(0, 30) }, 15, 7, false, diff --git a/src/openrct2/ride/rtd/transport/MiniatureRailway.h b/src/openrct2/ride/rtd/transport/MiniatureRailway.h index 700e1da249..91082cd763 100644 --- a/src/openrct2/ride/rtd/transport/MiniatureRailway.h +++ b/src/openrct2/ride/rtd/transport/MiniatureRailway.h @@ -58,7 +58,7 @@ constexpr RideTypeDescriptor MiniatureRailwayRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 50), RIDE_RATING(0, 00), RIDE_RATING(0, 00) }, + { MakeRideRating(2, 50), MakeRideRating(0, 00), MakeRideRating(0, 00) }, 11, -1, false, diff --git a/src/openrct2/ride/rtd/transport/Monorail.h b/src/openrct2/ride/rtd/transport/Monorail.h index 213c7ee9d9..7f26408f73 100644 --- a/src/openrct2/ride/rtd/transport/Monorail.h +++ b/src/openrct2/ride/rtd/transport/Monorail.h @@ -61,7 +61,7 @@ constexpr RideTypeDescriptor MonorailRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 00), RIDE_RATING(0, 00), RIDE_RATING(0, 00) }, + { MakeRideRating(2, 00), MakeRideRating(0, 00), MakeRideRating(0, 00) }, 14, -1, false, diff --git a/src/openrct2/ride/rtd/transport/SuspendedMonorail.h b/src/openrct2/ride/rtd/transport/SuspendedMonorail.h index 4b108f71eb..de19c7a4ed 100644 --- a/src/openrct2/ride/rtd/transport/SuspendedMonorail.h +++ b/src/openrct2/ride/rtd/transport/SuspendedMonorail.h @@ -59,7 +59,7 @@ constexpr RideTypeDescriptor SuspendedMonorailRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 15), RIDE_RATING(0, 23), RIDE_RATING(0, 8) }, + { MakeRideRating(2, 15), MakeRideRating(0, 23), MakeRideRating(0, 8) }, 14, -1, false, diff --git a/src/openrct2/ride/rtd/water/BoatHire.h b/src/openrct2/ride/rtd/water/BoatHire.h index 33f2f43ce0..b7f1a3d63f 100644 --- a/src/openrct2/ride/rtd/water/BoatHire.h +++ b/src/openrct2/ride/rtd/water/BoatHire.h @@ -62,12 +62,12 @@ constexpr RideTypeDescriptor BoatHireRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(1, 90), RIDE_RATING(0, 80), RIDE_RATING(0, 90) }, + { MakeRideRating(1, 90), MakeRideRating(0, 80), MakeRideRating(0, 90) }, 7, 0, false, { - { RatingsModifierType::BonusBoatHireNoCircuit, 0, RIDE_RATING(0, 20), 0, 0 }, + { RatingsModifierType::BonusBoatHireNoCircuit, 0, MakeRideRating(0, 20), 0, 0 }, { RatingsModifierType::BonusProximity, 0, 11183, 0, 0 }, { RatingsModifierType::BonusScenery, 0, 22310, 0, 0 }, }, diff --git a/src/openrct2/ride/rtd/water/DinghySlide.h b/src/openrct2/ride/rtd/water/DinghySlide.h index e51a665b68..2b534a4255 100644 --- a/src/openrct2/ride/rtd/water/DinghySlide.h +++ b/src/openrct2/ride/rtd/water/DinghySlide.h @@ -72,13 +72,13 @@ constexpr RideTypeDescriptor DinghySlideRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 70), RIDE_RATING(2, 00), RIDE_RATING(1, 50) }, + { MakeRideRating(2, 70), MakeRideRating(2, 00), MakeRideRating(1, 50) }, 13, -1, false, { { RatingsModifierType::BonusLength, 6000, 764, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 50), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 50), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusTrainLength, 0, 187245, 0, 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 44281, 88562, 35424 }, { RatingsModifierType::BonusAverageSpeed, 0, 291271, 436906, 0 }, diff --git a/src/openrct2/ride/rtd/water/LogFlume.h b/src/openrct2/ride/rtd/water/LogFlume.h index db13843628..bd21ddddf6 100644 --- a/src/openrct2/ride/rtd/water/LogFlume.h +++ b/src/openrct2/ride/rtd/water/LogFlume.h @@ -57,13 +57,13 @@ constexpr RideTypeDescriptor LogFlumeRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(1, 50), RIDE_RATING(0, 55), RIDE_RATING(0, 30) }, + { MakeRideRating(1, 50), MakeRideRating(0, 55), MakeRideRating(0, 30) }, 15, -1, false, { { RatingsModifierType::BonusLength, 2000, 7208, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 531372, 655360, 301111 }, { RatingsModifierType::BonusDuration, 300, 13107, 0, 0 }, { RatingsModifierType::BonusTurns, 0, 22291, 20860, 4574 }, diff --git a/src/openrct2/ride/rtd/water/RiverRafts.h b/src/openrct2/ride/rtd/water/RiverRafts.h index a9a0f3e8ad..29dc2a6565 100644 --- a/src/openrct2/ride/rtd/water/RiverRafts.h +++ b/src/openrct2/ride/rtd/water/RiverRafts.h @@ -56,13 +56,13 @@ constexpr RideTypeDescriptor RiverRaftsRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(1, 45), RIDE_RATING(0, 25), RIDE_RATING(0, 34) }, + { MakeRideRating(1, 45), MakeRideRating(0, 25), MakeRideRating(0, 34) }, 12, -1, false, { { RatingsModifierType::BonusLength, 2000, 7208, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 531372, 655360, 301111 }, { RatingsModifierType::BonusDuration, 500, 13107, 0, 0 }, { RatingsModifierType::BonusTurns, 0, 22291, 20860, 4574 }, diff --git a/src/openrct2/ride/rtd/water/RiverRapids.h b/src/openrct2/ride/rtd/water/RiverRapids.h index 95854495c1..79c52c8919 100644 --- a/src/openrct2/ride/rtd/water/RiverRapids.h +++ b/src/openrct2/ride/rtd/water/RiverRapids.h @@ -57,13 +57,13 @@ constexpr RideTypeDescriptor RiverRapidsRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(1, 20), RIDE_RATING(0, 70), RIDE_RATING(0, 50) }, + { MakeRideRating(1, 20), MakeRideRating(0, 70), MakeRideRating(0, 50) }, 16, -1, false, { { RatingsModifierType::BonusLength, 2000, 6225, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 30), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 30), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 115130, 159411, 106274 }, { RatingsModifierType::BonusDuration, 500, 13107, 0, 0 }, { RatingsModifierType::BonusTurns, 0, 29721, 22598, 5718 }, diff --git a/src/openrct2/ride/rtd/water/SplashBoats.h b/src/openrct2/ride/rtd/water/SplashBoats.h index 801376ebe7..a4cbd44bcc 100644 --- a/src/openrct2/ride/rtd/water/SplashBoats.h +++ b/src/openrct2/ride/rtd/water/SplashBoats.h @@ -58,13 +58,13 @@ constexpr RideTypeDescriptor SplashBoatsRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(1, 46), RIDE_RATING(0, 35), RIDE_RATING(0, 30) }, + { MakeRideRating(1, 46), MakeRideRating(0, 35), MakeRideRating(0, 30) }, 15, -1, false, { { RatingsModifierType::BonusLength, 2000, 7208, 0, 0 }, - { RatingsModifierType::BonusSynchronisation, 0, RIDE_RATING(0, 40), RIDE_RATING(0, 05), 0 }, + { RatingsModifierType::BonusSynchronisation, 0, MakeRideRating(0, 40), MakeRideRating(0, 05), 0 }, { RatingsModifierType::BonusMaxSpeed, 0, 797059, 655360, 301111 }, { RatingsModifierType::BonusDuration, 500, 13107, 0, 0 }, { RatingsModifierType::BonusTurns, 0, 22291, 20860, 4574 }, diff --git a/src/openrct2/ride/rtd/water/SubmarineRide.h b/src/openrct2/ride/rtd/water/SubmarineRide.h index 085e652a54..8d3e5539db 100644 --- a/src/openrct2/ride/rtd/water/SubmarineRide.h +++ b/src/openrct2/ride/rtd/water/SubmarineRide.h @@ -56,7 +56,7 @@ constexpr RideTypeDescriptor SubmarineRideRTD = .RatingsData = { RatingsCalculationType::Normal, - { RIDE_RATING(2, 20), RIDE_RATING(1, 80), RIDE_RATING(1, 40) }, + { MakeRideRating(2, 20), MakeRideRating(1, 80), MakeRideRating(1, 40) }, 7, -1, false, diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 822bf9aac9..2b243429c2 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -661,7 +661,7 @@ ObjectiveStatus Objective::Check10RollerCoasters() const BitSet type_already_counted; for (const auto& ride : GetRideManager()) { - if (ride.status == RideStatus::Open && ride.ratings.excitement >= RIDE_RATING(6, 00) + if (ride.status == RideStatus::Open && ride.ratings.excitement >= MakeRideRating(6, 00) && ride.subtype != kObjectEntryIndexNull) { auto rideEntry = ride.GetRideEntry(); @@ -763,7 +763,7 @@ ObjectiveStatus Objective::Check10RollerCoastersLength() const auto rcs = 0; for (const auto& ride : GetRideManager()) { - if (ride.status == RideStatus::Open && ride.ratings.excitement >= RIDE_RATING(7, 00) + if (ride.status == RideStatus::Open && ride.ratings.excitement >= MakeRideRating(7, 00) && ride.subtype != kObjectEntryIndexNull) { auto rideEntry = ride.GetRideEntry(); diff --git a/src/openrct2/scenario/Scenario.h b/src/openrct2/scenario/Scenario.h index 86d25bdf76..e6df2f8ec1 100644 --- a/src/openrct2/scenario/Scenario.h +++ b/src/openrct2/scenario/Scenario.h @@ -101,7 +101,7 @@ struct Objective union { money64 Currency; - uint16_t MinimumExcitement; // For the "Finish 5 coaster with a minimum excitement rating" objective. + ride_rating MinimumExcitement; // For the "Finish 5 coaster with a minimum excitement rating" objective. }; bool NeedsMoney() const diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 9bfadec72d..fa638df21f 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -143,7 +143,7 @@ namespace OpenRCT2::Park continue; if (ride.GetStation().SegmentLength < (600 << 16)) continue; - if (ride.ratings.excitement < RIDE_RATING(6, 00)) + if (ride.ratings.excitement < MakeRideRating(6, 00)) continue; // Bonus guests for good ride