From ef8fd20c991c5c1e340fc95b66012ef98e22532e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Breno=20Rodrigues=20Guimar=C3=A3es?= Date: Wed, 22 Apr 2020 21:24:51 -0300 Subject: [PATCH] Let Ride::FormatStatusTo return the number of written bytes (#11411) --- src/openrct2/ride/Ride.cpp | 7 ++++--- src/openrct2/ride/Ride.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index afb30675d1..11d3cc3151 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -753,10 +753,10 @@ int32_t ride_find_track_gap(const Ride* ride, CoordsXYE* input, CoordsXYE* outpu void Ride::FormatStatusTo(Formatter& ft) const { - FormatStatusTo(ft.Buf()); + ft.Increment(FormatStatusTo(ft.Buf())); } -void Ride::FormatStatusTo(void* argsV) const +size_t Ride::FormatStatusTo(void* argsV) const { Formatter ft(static_cast(argsV)); @@ -804,7 +804,7 @@ void Ride::FormatStatusTo(void* argsV) const { auto peep = sprite->AsPeep(); ft.Add(STR_RACE_WON_BY); - peep->FormatNameTo(ft.Buf()); + peep->FormatNameTo(ft); } else { @@ -821,6 +821,7 @@ void 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 d42f8ee4a8..e6011a81d6 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -443,7 +443,7 @@ public: void FormatNameTo(Formatter&) const; size_t FormatNameTo(void* args) const; void FormatStatusTo(Formatter&) const; - void FormatStatusTo(void* args) 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);