From 2f608c32ab89573f1a806ebe6802a1340452b082 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Fri, 26 Mar 2021 23:40:57 -0300 Subject: [PATCH] Use ScreenCoordsXY for window_ride_maintenance_draw_bar --- src/openrct2-ui/windows/Ride.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index caa03c9e2e..8472a6b37c 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -3692,9 +3692,8 @@ static void window_ride_locate_mechanic(rct_window* w) * rct2: 0x006B7D08 */ static void window_ride_maintenance_draw_bar( - rct_window* w, rct_drawpixelinfo* dpi, int32_t x, int32_t y, int32_t value, int32_t colour) + rct_window* w, rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t value, int32_t colour) { - ScreenCoordsXY coords{ x, y }; gfx_fill_rect_inset(dpi, { coords, coords + ScreenCoordsXY{ 149, 8 } }, w->colours[1], INSET_RECT_F_30); if (colour & BAR_BLINK) { @@ -4054,12 +4053,12 @@ static void window_ride_maintenance_paint(rct_window* w, rct_drawpixelinfo* dpi) uint16_t reliability = ride->reliability_percentage; DrawTextBasic(dpi, screenCoords, STR_RELIABILITY_LABEL_1757, &reliability); window_ride_maintenance_draw_bar( - w, dpi, screenCoords.x + 103, screenCoords.y, std::max(10, reliability), COLOUR_BRIGHT_GREEN); + w, dpi, screenCoords + ScreenCoordsXY{ 103, 0 }, std::max(10, reliability), COLOUR_BRIGHT_GREEN); screenCoords.y += 11; uint16_t downTime = ride->downtime; DrawTextBasic(dpi, screenCoords, STR_DOWN_TIME_LABEL_1889, &downTime); - window_ride_maintenance_draw_bar(w, dpi, screenCoords.x + 103, screenCoords.y, downTime, COLOUR_BRIGHT_RED); + window_ride_maintenance_draw_bar(w, dpi, screenCoords + ScreenCoordsXY{ 103, 0 }, downTime, COLOUR_BRIGHT_RED); screenCoords.y += 26; // Last inspection