mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Part of #11389: Use Formatter on Ride::FormatStatusTo (#12172)

This commit is contained in:
Tulio Leao 2020-07-09 13:54:30 -03:00 committed by GitHub
parent 6e83055910
commit f29abf6953
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2-ui/windows/Ride.cpp
View File

@ -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<uint8_t*>(arguments));
ride->FormatStatusTo(ft);
stringId = STR_BLACK_STRING;
if ((ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN) || (ride->lifecycle_flags & RIDE_LIFECYCLE_CRASHED))
{

3
src/openrct2-ui/windows/RideList.cpp
View File

@ -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))

8
src/openrct2/ride/Ride.cpp
View File

@ -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<uint8_t*>(argsV));
if (lifecycle_flags & RIDE_LIFECYCLE_CRASHED)
{
ft.Add<rct_string_id>(STR_CRASHED);
@ -849,7 +842,6 @@ size_t Ride::FormatStatusTo(void* argsV) const
{
ft.Add<rct_string_id>(STR_OPEN);
}
return ft.NumBytes();
}
int32_t ride_get_total_length(const Ride* ride)

1
src/openrct2/ride/Ride.h
View File

@ -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);