From b7dc5057e50a076477fd77225bf93caf88c2ab01 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Sun, 21 Jun 2020 08:46:51 -0300 Subject: [PATCH] Make gfx_draw_string_centred_wrapped_partial use ScreenCoordsXY --- src/openrct2-ui/windows/GameBottomToolbar.cpp | 3 +-- src/openrct2/drawing/Drawing.String.cpp | 6 +++--- src/openrct2/drawing/Drawing.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index e0a681119c..ab36362581 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -585,8 +585,7 @@ static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo* dpi, rc auto screenCoords = w->windowPos + ScreenCoordsXY{ middleOutsetWidget->midX(), middleOutsetWidget->top + 11 }; width = middleOutsetWidget->width() - 62; gfx_draw_string_centred_wrapped_partial( - dpi, screenCoords.x, screenCoords.y, width, COLOUR_BRIGHT_GREEN, STR_BOTTOM_TOOLBAR_NEWS_TEXT, &newsItemText, - newsItem->Ticks); + dpi, screenCoords, width, COLOUR_BRIGHT_GREEN, STR_BOTTOM_TOOLBAR_NEWS_TEXT, &newsItemText, newsItem->Ticks); screenCoords = w->windowPos + ScreenCoordsXY{ window_game_bottom_toolbar_widgets[WIDX_NEWS_SUBJECT].left, diff --git a/src/openrct2/drawing/Drawing.String.cpp b/src/openrct2/drawing/Drawing.String.cpp index 287a3eba2d..5bd623e21b 100644 --- a/src/openrct2/drawing/Drawing.String.cpp +++ b/src/openrct2/drawing/Drawing.String.cpp @@ -421,7 +421,7 @@ int32_t string_get_height_raw(char* buffer) * ticks : ebp >> 16 */ 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, + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, int32_t colour, rct_string_id format, void* args, int32_t ticks) { int32_t numLines, fontSpriteBase, lineHeight, lineY; @@ -440,7 +440,7 @@ void gfx_draw_string_centred_wrapped_partial( int32_t numCharactersToDraw = ticks; gCurrentFontFlags = 0; - lineY = y - ((numLines * lineHeight) / 2); + lineY = coords.y - ((numLines * lineHeight) / 2); for (int32_t line = 0; line <= numLines; line++) { int32_t halfWidth = gfx_get_string_width(buffer) / 2; @@ -462,7 +462,7 @@ void gfx_draw_string_centred_wrapped_partial( ch = nextCh; } - screenCoords = { x - halfWidth, lineY }; + screenCoords = { coords.x - halfWidth, lineY }; gfx_draw_string(dpi, buffer, TEXT_COLOUR_254, screenCoords); if (numCharactersDrawn > numCharactersToDraw) diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index b9b164cb27..34148260eb 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -673,7 +673,7 @@ void gfx_draw_string_left_centred( rct_drawpixelinfo* dpi, rct_string_id format, void* args, int32_t colour, const ScreenCoordsXY& coords); void draw_string_centred_raw(rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, 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, + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, int32_t colour, rct_string_id format, void* args, int32_t ticks); void gfx_draw_string_with_y_offsets( rct_drawpixelinfo* dpi, const utf8* text, int32_t colour, int32_t x, int32_t y, const int8_t* yOffsets,