From 3874cf4c914f345f9e7fdac7ae583c110f7c5335 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sat, 16 Aug 2025 06:38:20 -0300 Subject: [PATCH] Move RideRatingResetUpdateStates into namespace --- src/openrct2/park/ParkFile.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- src/openrct2/ride/RideRatings.cpp | 2 +- src/openrct2/ride/RideRatings.h | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 76697e8165..1a036aa4bf 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -654,7 +654,7 @@ namespace OpenRCT2 if (os.GetMode() == OrcaStream::Mode::READING) { // Since we read only one state ensure the rest is reset. - RideRatingResetUpdateStates(); + OpenRCT2::RideRating::ResetUpdateStates(); } auto& rideRatingUpdateState = rideRatings[0]; ReadWriteRideRatingCalculationData(cs, rideRatingUpdateState); diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index cbf5f4ad19..54764337b4 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1064,7 +1064,7 @@ namespace OpenRCT2::RCT2 { const auto& src = _s6.RideRatingsCalcData; // S6 has only one state, ensure we reset all states before reading the first one. - RideRatingResetUpdateStates(); + OpenRCT2::RideRating::ResetUpdateStates(); auto& rideRatingStates = getGameState().rideRatingUpdateStates; auto& dst = rideRatingStates[0]; dst = {}; diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index 90321bc158..20b1fdd26a 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -160,7 +160,7 @@ static void RideRatingsApplyRequirementStations(RatingTuple& ratings, const Ride static void RideRatingsApplyRequirementSplashdown(RatingTuple& ratings, const Ride& ride, RatingsModifier modifier); static void RideRatingsApplyPenaltyLateralGs(RatingTuple& ratings, const Ride& ride, RatingsModifier modifier); -void RideRatingResetUpdateStates() +void OpenRCT2::RideRating::ResetUpdateStates() { RideRatingUpdateState nullState{}; nullState.State = RIDE_RATINGS_STATE_FIND_NEXT_RIDE; diff --git a/src/openrct2/ride/RideRatings.h b/src/openrct2/ride/RideRatings.h index 39ed5c7013..67d414e488 100644 --- a/src/openrct2/ride/RideRatings.h +++ b/src/openrct2/ride/RideRatings.h @@ -64,7 +64,10 @@ struct RideRatingUpdateState static constexpr size_t kRideRatingMaxUpdateStates = 4; using RideRatingUpdateStates = std::array; -void RideRatingResetUpdateStates(); +namespace OpenRCT2::RideRating +{ + void ResetUpdateStates(); +} void RideRatingsUpdateRide(const Ride& ride); void RideRatingsUpdateAll();