From 80b5187da9b23c5d34e29669b1172ac39d3d5378 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sun, 17 Aug 2025 08:49:03 -0300 Subject: [PATCH] Rename ride_rating to RideRating_t --- src/openrct2-ui/interface/Objective.cpp | 2 +- .../windows/EditorScenarioOptions.cpp | 6 +++--- src/openrct2-ui/windows/Ride.cpp | 2 +- .../actions/RideFreezeRatingAction.cpp | 2 +- src/openrct2/actions/RideFreezeRatingAction.h | 4 ++-- src/openrct2/entity/Guest.cpp | 18 +++++++++--------- src/openrct2/interface/InteractiveConsole.cpp | 6 +++--- src/openrct2/ride/RideRatings.cpp | 16 ++++++++-------- src/openrct2/ride/RideRatings.h | 14 +++++++------- src/openrct2/scenario/Scenario.h | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/openrct2-ui/interface/Objective.cpp b/src/openrct2-ui/interface/Objective.cpp index d27e799ceb..de1dc0c438 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/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index f718e76e5d..58eb52d345 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -56,9 +56,9 @@ namespace OpenRCT2::Ui::Windows static constexpr uint16_t kObjectiveLengthMin = 1000; static constexpr uint16_t kObjectiveLengthAdjustment = 100; - static constexpr ride_rating kObjectiveExcitementMax = RideRating::make(9, 90); - static constexpr ride_rating kObjectiveExcitementMin = RideRating::make(4, 00); - static constexpr ride_rating kObjectiveExcitementAdjustment = RideRating::make(0, 10); + static constexpr RideRating_t kObjectiveExcitementMax = RideRating::make(9, 90); + static constexpr RideRating_t kObjectiveExcitementMin = RideRating::make(4, 00); + static constexpr RideRating_t kObjectiveExcitementAdjustment = RideRating::make(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; diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 0abf51b8d8..7f4c9e2630 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -5318,7 +5318,7 @@ namespace OpenRCT2::Ui::Windows #pragma region Measurements - static constexpr StringId GetRatingName(ride_rating rating) + static constexpr StringId GetRatingName(RideRating_t rating) { int32_t index = std::clamp(rating >> 8, 0, static_cast(std::size(RatingNames)) - 1); return RatingNames[index]; diff --git a/src/openrct2/actions/RideFreezeRatingAction.cpp b/src/openrct2/actions/RideFreezeRatingAction.cpp index 2789578591..87d806ca37 100644 --- a/src/openrct2/actions/RideFreezeRatingAction.cpp +++ b/src/openrct2/actions/RideFreezeRatingAction.cpp @@ -14,7 +14,7 @@ using namespace OpenRCT2; -RideFreezeRatingAction::RideFreezeRatingAction(RideId rideIndex, RideRatingType type, ride_rating value) +RideFreezeRatingAction::RideFreezeRatingAction(RideId rideIndex, RideRatingType type, RideRating_t value) : _rideIndex(rideIndex) , _type(type) , _value(value) diff --git a/src/openrct2/actions/RideFreezeRatingAction.h b/src/openrct2/actions/RideFreezeRatingAction.h index a5392a66a4..59c7929bf2 100644 --- a/src/openrct2/actions/RideFreezeRatingAction.h +++ b/src/openrct2/actions/RideFreezeRatingAction.h @@ -23,11 +23,11 @@ class RideFreezeRatingAction final : public GameActionBase maxNausea) { @@ -2787,8 +2787,8 @@ static int16_t GuestCalculateRideIntensityNauseaSatisfaction(Guest& guest, const uint8_t intensitySatisfaction = 3; uint8_t nauseaSatisfaction = 3; - ride_rating maxIntensity = guest.Intensity.GetMaximum() * 100; - ride_rating minIntensity = guest.Intensity.GetMinimum() * 100; + RideRating_t maxIntensity = guest.Intensity.GetMaximum() * 100; + RideRating_t minIntensity = guest.Intensity.GetMinimum() * 100; if (minIntensity <= ride.ratings.intensity && maxIntensity >= ride.ratings.intensity) { intensitySatisfaction--; @@ -2808,8 +2808,8 @@ static int16_t GuestCalculateRideIntensityNauseaSatisfaction(Guest& guest, const // Although it's not shown in the interface, a peep with Average or High nausea tolerance // has a minimum preferred nausea value. (For peeps with None or Low, this is set to zero.) - ride_rating minNausea = kNauseaMinimumThresholds[(EnumValue(guest.NauseaTolerance) & 3)]; - ride_rating maxNausea = NauseaMaximumThresholds[(EnumValue(guest.NauseaTolerance) & 3)]; + RideRating_t minNausea = kNauseaMinimumThresholds[(EnumValue(guest.NauseaTolerance) & 3)]; + RideRating_t maxNausea = NauseaMaximumThresholds[(EnumValue(guest.NauseaTolerance) & 3)]; if (minNausea <= ride.ratings.nausea && maxNausea >= ride.ratings.nausea) { nauseaSatisfaction--; diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 255ca9f1a7..e5e11decfc 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -288,7 +288,7 @@ static void ConsoleCommandRides(InteractiveConsole& console, const arguments_t& { bool int_valid[2] = { false }; int32_t ride_index = ConsoleParseInt(argv[2], &int_valid[0]); - ride_rating excitement = ConsoleParseInt(argv[3], &int_valid[1]); + RideRating_t excitement = ConsoleParseInt(argv[3], &int_valid[1]); if (ride_index < 0) { @@ -321,7 +321,7 @@ static void ConsoleCommandRides(InteractiveConsole& console, const arguments_t& { bool int_valid[2] = { false }; int32_t ride_index = ConsoleParseInt(argv[2], &int_valid[0]); - ride_rating intensity = ConsoleParseInt(argv[3], &int_valid[1]); + RideRating_t intensity = ConsoleParseInt(argv[3], &int_valid[1]); if (ride_index < 0) { @@ -354,7 +354,7 @@ static void ConsoleCommandRides(InteractiveConsole& console, const arguments_t& { bool int_valid[2] = { false }; int32_t ride_index = ConsoleParseInt(argv[2], &int_valid[0]); - ride_rating nausea = ConsoleParseInt(argv[3], &int_valid[1]); + RideRating_t nausea = ConsoleParseInt(argv[3], &int_valid[1]); if (ride_index < 0) { diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index cac2455d78..10434cdbcd 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -1340,8 +1340,8 @@ static void RideRatingsApplyAdjustments(const Ride& ride, RideRating::Tuple& rat */ static void RideRatingsApplyIntensityPenalty(RideRating::Tuple& ratings) { - static constexpr ride_rating intensityBounds[] = { 1000, 1100, 1200, 1320, 1450 }; - ride_rating excitement = ratings.excitement; + static constexpr RideRating_t intensityBounds[] = { 1000, 1100, 1200, 1320, 1450 }; + RideRating_t excitement = ratings.excitement; for (auto intensityBound : intensityBounds) { if (ratings.intensity >= intensityBound) @@ -1608,8 +1608,8 @@ static RideRating::Tuple GetSpecialTrackElementsRating(uint8_t type, const Ride& int32_t helixesOver5UpTo10 = std::clamp(helixSections - 5, 0, 10); nausea += (helixesOver5UpTo10 * 0x140000) >> 16; - RideRating::Tuple rating = { static_cast(excitement), static_cast(intensity), - static_cast(nausea) }; + RideRating::Tuple rating = { static_cast(excitement), static_cast(intensity), + static_cast(nausea) }; return rating; } @@ -1646,8 +1646,8 @@ static RideRating::Tuple ride_ratings_get_turns_ratings(const Ride& ride) intensity += inversionsRating.intensity; nausea += inversionsRating.nausea; - RideRating::Tuple rating = { static_cast(excitement), static_cast(intensity), - static_cast(nausea) }; + RideRating::Tuple rating = { static_cast(excitement), static_cast(intensity), + static_cast(nausea) }; return rating; } @@ -1685,8 +1685,8 @@ static RideRating::Tuple ride_ratings_get_sheltered_ratings(const Ride& ride) lowerVal = std::min(lowerVal, 11); excitement += (lowerVal * 774516) >> 16; - RideRating::Tuple rating = { static_cast(excitement), static_cast(intensity), - static_cast(nausea) }; + RideRating::Tuple rating = { static_cast(excitement), static_cast(intensity), + static_cast(nausea) }; return rating; } diff --git a/src/openrct2/ride/RideRatings.h b/src/openrct2/ride/RideRatings.h index 65e6149bc7..51046cec9c 100644 --- a/src/openrct2/ride/RideRatings.h +++ b/src/openrct2/ride/RideRatings.h @@ -20,26 +20,26 @@ struct Ride; namespace OpenRCT2 { enum class TrackElemType : uint16_t; - using ride_rating = fixed16_2dp; + using RideRating_t = fixed16_2dp; namespace RideRating { // Convenience function for writing ride ratings. The result is a 16 bit signed // integer. To create the ride rating 3.65 type MakeRideRating(3, 65). - constexpr ride_rating make(int16_t whole, uint8_t fraction) + constexpr RideRating_t make(int16_t whole, uint8_t fraction) { - return MakeFixed2dp(whole, fraction); + return MakeFixed2dp(whole, fraction); } - constexpr ride_rating kUndefined = 0xFFFFu; + constexpr RideRating_t kUndefined = 0xFFFFu; #pragma pack(push, 1) // Used for return values, for functions that modify all three. struct Tuple { - ride_rating excitement{}; - ride_rating intensity{}; - ride_rating nausea{}; + RideRating_t excitement{}; + RideRating_t intensity{}; + RideRating_t nausea{}; bool isNull() const; void setNull(); diff --git a/src/openrct2/scenario/Scenario.h b/src/openrct2/scenario/Scenario.h index 08d18c4430..46ab33276b 100644 --- a/src/openrct2/scenario/Scenario.h +++ b/src/openrct2/scenario/Scenario.h @@ -97,7 +97,7 @@ struct Objective union { money64 Currency; - OpenRCT2::ride_rating MinimumExcitement; // For the "Finish 5 coaster with a minimum excitement rating" objective. + OpenRCT2::RideRating_t MinimumExcitement; // For the "Finish 5 coaster with a minimum excitement rating" objective. }; bool NeedsMoney() const