From a0ed2c181e15519477e59b9c1b456120c11c2c7c Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sun, 21 Jun 2020 08:38:25 -0300 Subject: [PATCH] Make gfx_draw_string_left_centred use ScreenCoordsXY --- src/openrct2-ui/interface/Widget.cpp | 2 +- src/openrct2/drawing/Drawing.String.cpp | 4 ++-- src/openrct2/drawing/Drawing.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index 87c863b9aa..a5bff5a089 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -624,7 +624,7 @@ static void widget_checkbox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widg return; auto [stringId, formatArgs] = widget_get_stringid_and_args(widget); - gfx_draw_string_left_centred(dpi, stringId, formatArgs, colour, l + 14, yMid); + gfx_draw_string_left_centred(dpi, stringId, formatArgs, colour, { l + 14, yMid }); } /** diff --git a/src/openrct2/drawing/Drawing.String.cpp b/src/openrct2/drawing/Drawing.String.cpp index 034e5f0e04..a90680af70 100644 --- a/src/openrct2/drawing/Drawing.String.cpp +++ b/src/openrct2/drawing/Drawing.String.cpp @@ -245,13 +245,13 @@ int32_t gfx_wrap_string(utf8* text, int32_t width, int32_t* outNumLines, int32_t * Draws text that is left aligned and vertically centred. */ void gfx_draw_string_left_centred( - rct_drawpixelinfo* dpi, rct_string_id format, void* args, int32_t colour, int32_t x, int32_t y) + rct_drawpixelinfo* dpi, rct_string_id format, void* args, int32_t colour, const ScreenCoordsXY& coords) { gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; char* buffer = gCommonStringFormatBuffer; format_string(buffer, 256, format, args); int32_t height = string_get_height_raw(buffer); - gfx_draw_string(dpi, buffer, colour, { x, y - (height / 2) }); + gfx_draw_string(dpi, buffer, colour, coords - ScreenCoordsXY{ 0, (height / 2) }); } /** diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index 680bf8d21b..56565e34ec 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -670,7 +670,7 @@ int32_t gfx_draw_string_centred_wrapped( rct_drawpixelinfo* dpi, void* args, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, uint8_t colour); void gfx_draw_string_left_centred( - rct_drawpixelinfo* dpi, rct_string_id format, void* args, int32_t colour, int32_t x, int32_t y); + rct_drawpixelinfo* dpi, rct_string_id format, void* args, int32_t colour, const ScreenCoordsXY& coords); void draw_string_centred_raw(rct_drawpixelinfo* dpi, int32_t x, int32_t y, int32_t numLines, char* text); void gfx_draw_string_centred_wrapped_partial( rct_drawpixelinfo* dpi, int32_t x, int32_t y, int32_t width, int32_t colour, rct_string_id format, void* args,