From f1caddc9feca7820398ece1c84d795bf87dcb7e0 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 26 Aug 2020 14:46:37 +0200 Subject: [PATCH] Remove draw_string_right_underline() --- src/openrct2-ui/windows/Finances.cpp | 7 ++++--- src/openrct2/drawing/Drawing.h | 2 -- src/openrct2/drawing/Text.cpp | 6 ------ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 43fea6a86c..b734c4c682 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -755,9 +755,10 @@ static void window_finances_summary_scrollpaint(rct_window* w, rct_drawpixelinfo auto ft = Formatter::Common(); ft.Add(STR_FINANCES_SUMMARY_MONTH_HEADING); ft.Add(monthyear); - draw_string_right_underline( - dpi, monthyear == currentMonthYear ? STR_WINDOW_COLOUR_2_STRINGID : STR_BLACK_STRING, gCommonFormatArgs, - COLOUR_BLACK, screenCoords + ScreenCoordsXY{ EXPENDITURE_COLUMN_WIDTH, 0 }); + DrawTextBasic( + dpi, screenCoords + ScreenCoordsXY{ EXPENDITURE_COLUMN_WIDTH, 0 }, + monthyear == currentMonthYear ? STR_WINDOW_COLOUR_2_STRINGID : STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, + TextAlignment::RIGHT, true); screenCoords.y += 14; // Month expenditures diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index ee1b3145c8..e1e75e0532 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -658,8 +658,6 @@ void gfx_draw_string_right( void draw_string_left_underline( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords); -void draw_string_right_underline( - rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords); void gfx_draw_string_left_clipped( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords, int32_t width); diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index 3c69c6fa71..89139d3e4b 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -169,12 +169,6 @@ void draw_string_left_underline( DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::LEFT, true); } -void draw_string_right_underline( - rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords) -{ - DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::RIGHT, true); -} - // Ellipsised void gfx_draw_string_left_clipped( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords, int32_t width)