diff --git a/src/openrct2/GameState.h b/src/openrct2/GameState.h index c4a3b6d075..b1b9948ff1 100644 --- a/src/openrct2/GameState.h +++ b/src/openrct2/GameState.h @@ -73,7 +73,7 @@ namespace OpenRCT2 // Ride storage for all the rides in the park, rides with RideId::Null are considered free. std::array rides{}; size_t ridesEndOfUsedRange{}; - RideRatingUpdateStates rideRatingUpdateStates; + RideRating::UpdateStates rideRatingUpdateStates; std::vector tileElements; std::vector restrictedScenery; diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index 5e45b09d70..470737acbc 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -89,7 +89,7 @@ struct ShelteredEights }; // Amount of updates allowed per updating state on the current tick. -// The total amount would be MaxRideRatingSubSteps * kRideRatingMaxUpdateStates which +// The total amount would be MaxRideRatingSubSteps * OpenRCT2::RideRating::kMaxUpdateStates which // would be currently 80, this is the worst case of sub-steps and may break out earlier. static constexpr size_t MaxRideRatingUpdateSubSteps = 20; diff --git a/src/openrct2/ride/RideRatings.h b/src/openrct2/ride/RideRatings.h index 3758a7bbb5..bf343ced72 100644 --- a/src/openrct2/ride/RideRatings.h +++ b/src/openrct2/ride/RideRatings.h @@ -64,17 +64,16 @@ struct RideRatingUpdateState uint16_t StationFlags; }; -static constexpr size_t kRideRatingMaxUpdateStates = 4; -using RideRatingUpdateStates = std::array; - namespace OpenRCT2::RideRating { + static constexpr size_t kMaxUpdateStates = 4; + using UpdateStates = std::array; + void ResetUpdateStates(); void UpdateRide(const Ride& ride); void UpdateAll(); } // namespace OpenRCT2::RideRating - // Special Track Element Adjustment functions for RTDs void SpecialTrackElementRatingsAjustment_Default(const Ride& ride, int32_t& excitement, int32_t& intensity, int32_t& nausea); void SpecialTrackElementRatingsAjustment_GhostTrain(const Ride& ride, int32_t& excitement, int32_t& intensity, int32_t& nausea);