diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 03933f8e99..cad9472fdb 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -1901,7 +1901,7 @@ void window_guest_thoughts_paint(rct_window* w, rct_drawpixelinfo* dpi) - window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].left - 8; peep_thought_set_format_args(thought); - y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_BLACK_STRING, COLOUR_BLACK); + y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, { x, y }, width, STR_BLACK_STRING, COLOUR_BLACK); // If this is the last visible line end drawing. if (y > w->windowPos.y + window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].bottom - 32) @@ -2044,7 +2044,7 @@ void window_guest_inventory_paint(rct_window* w, rct_drawpixelinfo* dpi) continue; rct_string_id stringId = window_guest_inventory_format_item(guest, item); - y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, itemNameWidth, stringId, COLOUR_BLACK); + y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, { x, y }, itemNameWidth, stringId, COLOUR_BLACK); numItems++; } diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index bd1fbbff88..f925c5b43c 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -495,14 +495,15 @@ static void window_multiplayer_information_paint(rct_window* w, rct_drawpixelinf const utf8* name = network_get_server_name(); { - y += gfx_draw_string_left_wrapped(dpi, static_cast(&name), x, y, width, STR_STRING, w->colours[1]); + y += gfx_draw_string_left_wrapped(dpi, static_cast(&name), { x, y }, width, STR_STRING, w->colours[1]); y += LIST_ROW_HEIGHT / 2; } const utf8* description = network_get_server_description(); if (!str_is_null_or_empty(description)) { - y += gfx_draw_string_left_wrapped(dpi, static_cast(&description), x, y, width, STR_STRING, w->colours[1]); + y += gfx_draw_string_left_wrapped( + dpi, static_cast(&description), { x, y }, width, STR_STRING, w->colours[1]); y += LIST_ROW_HEIGHT / 2; } diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index c0ab3a4b74..306efc52c6 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -973,7 +973,7 @@ static void window_new_ride_paint_ride_information( auto ft = Formatter::Common(); ft.Add(rideNaming.name); ft.Add(rideNaming.description); - gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_NEW_RIDE_NAME_AND_DESCRIPTION, COLOUR_BLACK); + gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, { x, y }, width, STR_NEW_RIDE_NAME_AND_DESCRIPTION, COLOUR_BLACK); char availabilityString[AVAILABILITY_STRING_SIZE]; window_new_ride_list_vehicles_for(item.Type, rideEntry, availabilityString, sizeof(availabilityString)); diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 5ed27ecdde..f43e01bf65 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -290,7 +290,7 @@ static void window_news_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32 // Item text utf8* text = newsItem->Text; - gfx_draw_string_left_wrapped(dpi, &text, 2, y + lineHeight, 325, STR_BOTTOM_TOOLBAR_NEWS_TEXT, COLOUR_BRIGHT_GREEN); + gfx_draw_string_left_wrapped(dpi, &text, { 2, y + lineHeight }, 325, STR_BOTTOM_TOOLBAR_NEWS_TEXT, COLOUR_BRIGHT_GREEN); // Subject button if ((news_type_properties[newsItem->Type] & NEWS_TYPE_HAS_SUBJECT) && !(newsItem->Flags & NEWS_FLAG_HAS_BUTTON)) diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index 64c72e5d19..9e06202ea0 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -560,7 +560,7 @@ static void window_object_load_error_paint(rct_window* w, rct_drawpixelinfo* dpi // Draw explanatory message set_format_arg(0, rct_string_id, STR_OBJECT_ERROR_WINDOW_EXPLANATION); gfx_draw_string_left_wrapped( - dpi, gCommonFormatArgs, w->windowPos.x + 5, w->windowPos.y + 18, WW - 10, STR_BLACK_STRING, COLOUR_BLACK); + dpi, gCommonFormatArgs, { w->windowPos.x + 5, w->windowPos.y + 18 }, WW - 10, STR_BLACK_STRING, COLOUR_BLACK); // Draw file name set_format_arg(0, rct_string_id, STR_OBJECT_ERROR_WINDOW_FILE); diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index c348417dfd..a4e8d68663 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -1599,7 +1599,7 @@ static void window_park_objective_paint(rct_window* w, rct_drawpixelinfo* dpi) auto ft = Formatter::Common(); ft.Add(STR_STRING); ft.Add(gScenarioDetails.c_str()); - y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 222, STR_BLACK_STRING, COLOUR_BLACK); + y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, { x, y }, 222, STR_BLACK_STRING, COLOUR_BLACK); y += 5; // Your objective: @@ -1612,7 +1612,8 @@ static void window_park_objective_paint(rct_window* w, rct_drawpixelinfo* dpi) ft.Add(date_get_total_months(MONTH_OCTOBER, gScenarioObjectiveYear)); ft.Add(gScenarioObjectiveCurrency); - y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 221, ObjectiveNames[gScenarioObjectiveType], COLOUR_BLACK); + y += gfx_draw_string_left_wrapped( + dpi, gCommonFormatArgs, { x, y }, 221, ObjectiveNames[gScenarioObjectiveType], COLOUR_BLACK); y += 5; // Objective outcome @@ -1621,13 +1622,13 @@ static void window_park_objective_paint(rct_window* w, rct_drawpixelinfo* dpi) if (gScenarioCompletedCompanyValue == COMPANY_VALUE_ON_FAILED_OBJECTIVE) { // Objective failed - gfx_draw_string_left_wrapped(dpi, nullptr, x, y, 222, STR_OBJECTIVE_FAILED, COLOUR_BLACK); + gfx_draw_string_left_wrapped(dpi, nullptr, { x, y }, 222, STR_OBJECTIVE_FAILED, COLOUR_BLACK); } else { // Objective completed set_format_arg(0, money32, gScenarioCompletedCompanyValue); - gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 222, STR_OBJECTIVE_ACHIEVED, COLOUR_BLACK); + gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, { x, y }, 222, STR_OBJECTIVE_ACHIEVED, COLOUR_BLACK); } } } @@ -1741,7 +1742,7 @@ static void window_park_awards_paint(rct_window* w, rct_drawpixelinfo* dpi) continue; gfx_draw_sprite(dpi, ParkAwards[award->Type].sprite, x, y, 0); - gfx_draw_string_left_wrapped(dpi, nullptr, x + 34, y + 6, 180, ParkAwards[award->Type].text, COLOUR_BLACK); + gfx_draw_string_left_wrapped(dpi, nullptr, { x + 34, y + 6 }, 180, ParkAwards[award->Type].text, COLOUR_BLACK); y += 32; count++;