diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index b7ae6e13e6..8894ef309c 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -2664,7 +2664,8 @@ static rct_string_id window_ride_get_status_overall_view(rct_window* w, void* ar auto ride = get_ride(w->number); if (ride != nullptr) { - ride->FormatStatusTo(arguments); + auto ft = Formatter(static_cast(arguments)); + ride->FormatStatusTo(ft); stringId = STR_BLACK_STRING; if ((ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) || (ride->lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) { diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index ca9666f525..1e33658483 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -618,7 +618,8 @@ static void window_ride_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, { case INFORMATION_TYPE_STATUS: formatSecondaryEnabled = false; - ride->FormatStatusTo(gCommonFormatArgs); + ft.Rewind(); + ride->FormatStatusTo(ft); // Make test red and bold if broken down or crashed if ((ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) || (ride->lifecycle_flags & RIDE_LIFECYCLE_CRASHED)) diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index dc25caca15..106386f193 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -782,13 +782,6 @@ int32_t ride_find_track_gap(const Ride* ride, CoordsXYE* input, CoordsXYE* outpu void Ride::FormatStatusTo(Formatter& ft) const { - ft.Increment(FormatStatusTo(ft.Buf())); -} - -size_t Ride::FormatStatusTo(void* argsV) const -{ - Formatter ft(static_cast(argsV)); - if (lifecycle_flags & RIDE_LIFECYCLE_CRASHED) { ft.Add(STR_CRASHED); @@ -849,7 +842,6 @@ size_t Ride::FormatStatusTo(void* argsV) const { ft.Add(STR_OPEN); } - return ft.NumBytes(); } int32_t ride_get_total_length(const Ride* ride) diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index b352e3e8fa..dc82a5432e 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -423,7 +423,6 @@ public: std::string GetName() const; void FormatNameTo(Formatter&) const; void FormatStatusTo(Formatter&) const; - size_t FormatStatusTo(void* args) const; static void UpdateAll(); static bool NameExists(const std::string_view& name, ride_id_t excludeRideId = RIDE_ID_NULL);