diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index 81b23ff2a1..deeccd5b28 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -987,7 +987,7 @@ static void window_editor_objective_options_main_paint(rct_window* w, rct_drawpi ft = Formatter::Common(); ft.Add(STR_STRING); ft.Add(gS6Info.details); - gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_BLACK_STRING, COLOUR_BLACK); + gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, { x, y }, width, STR_BLACK_STRING, COLOUR_BLACK); // Scenario category label x = w->windowPos.x + 8; diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index 2c5d300548..079c1ccf05 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -556,6 +556,8 @@ void gfx_draw_string_right_clipped( 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); +int32_t gfx_draw_string_left_wrapped( + rct_drawpixelinfo* dpi, void* args, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, uint8_t colour); 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); diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index b84c1d3332..0879ed9013 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -212,6 +212,12 @@ void gfx_draw_string_right_clipped( // Wrapping 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) +{ + return gfx_draw_string_left_wrapped(dpi, args, { x, y }, width, format, colour); +} + +int32_t gfx_draw_string_left_wrapped( + rct_drawpixelinfo* dpi, void* args, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, uint8_t colour) { utf8 buffer[512]; format_string(buffer, sizeof(buffer), format, args); @@ -224,7 +230,7 @@ int32_t gfx_draw_string_left_wrapped( _legacyPaint.SpriteBase = gCurrentFontSpriteBase; StaticLayout layout(buffer, _legacyPaint, width); - layout.Draw(dpi, x, y); + layout.Draw(dpi, coords.x, coords.y); return layout.GetHeight(); }