From a687a13185ee0266232d419d669ed7b37a747777 Mon Sep 17 00:00:00 2001 From: TomasZilinek Date: Tue, 19 May 2020 18:54:07 +0200 Subject: [PATCH] Fix #11563 - gfx_draw_string_right_clipped() overload (#11782) created the overload, changed all calls from the old function to the new one and deleted the old function --- src/openrct2-ui/windows/LoadSave.cpp | 2 +- src/openrct2/drawing/Drawing.h | 2 +- src/openrct2/drawing/Text.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index 39216ea0f9..9c1630bb5b 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -788,7 +788,7 @@ static void window_loadsave_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, i set_format_arg(0, rct_string_id, STR_STRING); set_format_arg(2, char*, _listItems[i].date_formatted.c_str()); gfx_draw_string_right_clipped( - dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, dateAnchor - DATE_TIME_GAP, y, maxDateWidth); + dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, { dateAnchor - DATE_TIME_GAP, y }, maxDateWidth); set_format_arg(2, char*, _listItems[i].time_formatted.c_str()); gfx_draw_string_left_clipped( diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index 079c1ccf05..0053dee3dc 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -552,7 +552,7 @@ void gfx_draw_string_left_clipped( void gfx_draw_string_centred_clipped( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, int32_t x, int32_t y, int32_t width); void gfx_draw_string_right_clipped( - rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, int32_t x, int32_t y, int32_t width); + rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords, int32_t width); int32_t gfx_draw_string_left_wrapped( rct_drawpixelinfo* dpi, void* args, int32_t x, int32_t y, int32_t width, rct_string_id format, uint8_t colour); diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index 0879ed9013..4f67ccfe39 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -204,9 +204,9 @@ void gfx_draw_string_centred_clipped( } void gfx_draw_string_right_clipped( - rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, int32_t x, int32_t y, int32_t width) + rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords, int32_t width) { - DrawTextEllipsisedCompat(dpi, x, y, width, format, args, colour, TextAlignment::RIGHT); + DrawTextEllipsisedCompat(dpi, coords.x, coords.y, width, format, args, colour, TextAlignment::RIGHT); } // Wrapping