From 7582ed849ab670d54de2c4d6cf6a06712bc5177b Mon Sep 17 00:00:00 2001 From: TomasZilinek Date: Sun, 17 May 2020 21:18:15 +0200 Subject: [PATCH] Fix #11568 - create draw_string_left_underline() overload (#11770) * Fix #11568 - create draw_string_left_underline() overload created the overload, changed all calls from the old function to the new (just 1 call) and deleted the old function --- src/openrct2-ui/windows/Finances.cpp | 16 +++++++++------- src/openrct2/drawing/Drawing.h | 3 ++- src/openrct2/drawing/Text.cpp | 5 +++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index ece82adae9..48c5a4e20b 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -665,22 +665,24 @@ static void window_finances_summary_paint(rct_window* w, rct_drawpixelinfo* dpi) window_draw_widgets(w, dpi); window_finances_draw_tab_images(dpi, w); - int32_t x = w->windowPos.x + 8; - int32_t y = w->windowPos.y + 51; + auto screenCoords = ScreenCoordsXY{ w->windowPos.x + 8, w->windowPos.y + 51 }; // Expenditure / Income heading - draw_string_left_underline(dpi, STR_FINANCES_SUMMARY_EXPENDITURE_INCOME, nullptr, COLOUR_BLACK, x, y); - y += 14; + draw_string_left_underline(dpi, STR_FINANCES_SUMMARY_EXPENDITURE_INCOME, nullptr, COLOUR_BLACK, screenCoords); + screenCoords.y += 14; // Expenditure / Income row labels for (int32_t i = 0; i < static_cast(ExpenditureType::Count); i++) { // Darken every even row if (i % 2 == 0) - gfx_fill_rect(dpi, x, y - 1, x + 121, y + (TABLE_CELL_HEIGHT - 2), ColourMapA[w->colours[1]].lighter | 0x1000000); + gfx_fill_rect( + dpi, screenCoords.x, screenCoords.y - 1, screenCoords.x + 121, screenCoords.y + (TABLE_CELL_HEIGHT - 2), + ColourMapA[w->colours[1]].lighter | 0x1000000); - gfx_draw_string_left(dpi, window_finances_summary_row_labels[i], nullptr, COLOUR_BLACK, x, y - 1); - y += TABLE_CELL_HEIGHT; + gfx_draw_string_left( + dpi, window_finances_summary_row_labels[i], nullptr, COLOUR_BLACK, screenCoords.x, screenCoords.y - 1); + screenCoords.y += TABLE_CELL_HEIGHT; } // Horizontal rule below expenditure / income table diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index 6528d18c2e..ea2fae2b2f 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -540,7 +540,8 @@ void gfx_draw_string_right( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords); void gfx_draw_string_right(rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, int32_t x, int32_t y); -void draw_string_left_underline(rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, int32_t x, int32_t y); +void draw_string_left_underline( + rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords); void draw_string_centred_underline( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, int32_t x, int32_t y); void draw_string_right_underline( diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index 2b5b0bc1df..07c3feafcf 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -173,9 +173,10 @@ void gfx_draw_string_right( DrawTextCompat(dpi, coords.x, coords.y, format, args, colour, TextAlignment::RIGHT); } // Underline -void draw_string_left_underline(rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, int32_t x, int32_t y) +void draw_string_left_underline( + rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords) { - DrawTextCompat(dpi, x, y, format, args, colour, TextAlignment::LEFT, true); + DrawTextCompat(dpi, coords.x, coords.y, format, args, colour, TextAlignment::LEFT, true); } void draw_string_centred_underline(