From f640446d58d87e6fe79ecb9b2bff97939664b034 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 3 Jun 2020 00:40:47 +0200 Subject: [PATCH] Migrate 40 calls to set_format_arg() --- .../windows/EditorObjectSelection.cpp | 20 ++++++----- src/openrct2-ui/windows/Finances.cpp | 6 ++-- src/openrct2-ui/windows/Guest.cpp | 35 ++++++++++++------- src/openrct2-ui/windows/GuestList.cpp | 8 +++-- src/openrct2-ui/windows/LoadSave.cpp | 8 +++-- src/openrct2-ui/windows/Map.cpp | 4 ++- src/openrct2-ui/windows/MazeConstruction.cpp | 4 ++- src/openrct2-ui/windows/News.cpp | 5 +-- src/openrct2-ui/windows/ObjectLoadError.cpp | 8 +++-- src/openrct2-ui/windows/Options.cpp | 6 ++-- src/openrct2-ui/windows/Park.cpp | 3 +- src/openrct2-ui/windows/TitleEditor.cpp | 5 ++- 12 files changed, 72 insertions(+), 40 deletions(-) diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index dc155ebb05..8021599090 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -1017,8 +1017,9 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf if (gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) totalSelectable = 4; - set_format_arg(0, uint16_t, numSelected); - set_format_arg(2, uint16_t, totalSelectable); + auto ft = Formatter::Common(); + ft.Add(numSelected); + ft.Add(totalSelectable); gfx_draw_string_left(dpi, STR_OBJECT_SELECTION_SELECTION_SIZE, gCommonFormatArgs, COLOUR_BLACK, x, y); } @@ -1065,16 +1066,18 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf x = w->windowPos.x + (widget->left + widget->right) / 2 + 1; y = w->windowPos.y + widget->bottom + 3; width = w->width - w->widgets[WIDX_LIST].right - 6; - set_format_arg(0, rct_string_id, STR_STRING); - set_format_arg(2, const char*, listItem->repositoryItem->Name.c_str()); + auto ft = Formatter::Common(); + ft.Add(STR_STRING); + ft.Add(listItem->repositoryItem->Name.c_str()); gfx_draw_string_centred_clipped(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, x, y, width); // Draw description of object auto description = object_get_description(_loadedObject); if (!description.empty()) { - set_format_arg(0, rct_string_id, STR_STRING); - set_format_arg(2, const char*, description.c_str()); + ft = Formatter::Common(); + ft.Add(STR_STRING); + ft.Add(description.c_str()); x = w->windowPos.x + w->widgets[WIDX_LIST].right + 4; y += 15; @@ -1101,8 +1104,9 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf // Draw object dat name const char* path = path_get_filename(listItem->repositoryItem->Path.c_str()); - set_format_arg(0, rct_string_id, STR_STRING); - set_format_arg(2, const char*, path); + ft = Formatter::Common(); + ft.Add(STR_STRING); + ft.Add(path); gfx_draw_string_right(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, w->windowPos.x + w->width - 5, y); } diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 96c6d0ed1c..dee2e2017f 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -692,7 +692,8 @@ static void window_finances_summary_paint(rct_window* w, rct_drawpixelinfo* dpi) // Loan and interest rate gfx_draw_string_left(dpi, STR_FINANCES_SUMMARY_LOAN, nullptr, COLOUR_BLACK, w->windowPos.x + 8, w->windowPos.y + 279); - set_format_arg(0, uint16_t, gBankLoanInterestRate); + auto ft = Formatter::Common(); + ft.Add(gBankLoanInterestRate); gfx_draw_string_left( dpi, STR_FINANCES_SUMMARY_AT_X_PER_YEAR, gCommonFormatArgs, COLOUR_BLACK, w->windowPos.x + 167, w->windowPos.y + 279); @@ -704,7 +705,8 @@ static void window_finances_summary_paint(rct_window* w, rct_drawpixelinfo* dpi) if (gScenarioObjectiveType == OBJECTIVE_MONTHLY_FOOD_INCOME) { money32 lastMonthProfit = finance_get_last_month_shop_profit(); - set_format_arg(0, money32, lastMonthProfit); + ft = Formatter::Common(); + ft.Add(lastMonthProfit); gfx_draw_string_left( dpi, STR_LAST_MONTH_PROFIT_FROM_FOOD_DRINK_MERCHANDISE_SALES_LABEL, gCommonFormatArgs, COLOUR_BLACK, w->windowPos.x + 280, w->windowPos.y + 279); diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index dbe940cf43..1bc96c38b9 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -1697,7 +1697,8 @@ void window_guest_rides_paint(rct_window* w, rct_drawpixelinfo* dpi) y = w->windowPos.y + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].bottom - 12; - set_format_arg(0, rct_string_id, STR_PEEP_FAVOURITE_RIDE_NOT_AVAILABLE); + auto ft = Formatter::Common(); + ft.Add(STR_PEEP_FAVOURITE_RIDE_NOT_AVAILABLE); if (peep->FavouriteRide != RIDE_ID_NULL) { auto ride = get_ride(peep->FavouriteRide); @@ -1778,25 +1779,29 @@ void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi) int32_t y = w->windowPos.y + window_guest_finance_widgets[WIDX_PAGE_BACKGROUND].top + 4; // Cash in pocket - set_format_arg(0, money32, peep->cash_in_pocket); + auto ft = Formatter::Common(); + ft.Add(peep->cash_in_pocket); gfx_draw_string_left(dpi, STR_GUEST_STAT_CASH_IN_POCKET, gCommonFormatArgs, COLOUR_BLACK, x, y); // Cash spent y += LIST_ROW_HEIGHT; - set_format_arg(0, money32, peep->cash_spent); + ft = Formatter::Common(); + ft.Add(peep->cash_spent); gfx_draw_string_left(dpi, STR_GUEST_STAT_CASH_SPENT, gCommonFormatArgs, COLOUR_BLACK, x, y); y += LIST_ROW_HEIGHT * 2; gfx_fill_rect_inset(dpi, x, y - 6, x + 179, y - 5, w->colours[1], INSET_RECT_FLAG_BORDER_INSET); // Paid to enter - set_format_arg(0, money32, peep->PaidToEnter); + ft = Formatter::Common(); + ft.Add(peep->PaidToEnter); gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_ENTRANCE_FEE, gCommonFormatArgs, COLOUR_BLACK, x, y); // Paid on rides y += LIST_ROW_HEIGHT; - set_format_arg(0, money32, peep->PaidOnRides); - set_format_arg(4, uint16_t, peep->no_of_rides); + ft = Formatter::Common(); + ft.Add(peep->PaidOnRides); + ft.Add(peep->no_of_rides); if (peep->no_of_rides != 1) { gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_RIDE_PLURAL, gCommonFormatArgs, COLOUR_BLACK, x, y); @@ -1808,8 +1813,9 @@ void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi) // Paid on food y += LIST_ROW_HEIGHT; - set_format_arg(0, money32, peep->PaidOnFood); - set_format_arg(4, uint16_t, peep->AmountOfFood); + ft = Formatter::Common(); + ft.Add(peep->PaidOnFood); + ft.Add(peep->AmountOfFood); if (peep->AmountOfFood != 1) { gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_FOOD_PLURAL, gCommonFormatArgs, COLOUR_BLACK, x, y); @@ -1821,8 +1827,9 @@ void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi) // Paid on drinks y += LIST_ROW_HEIGHT; - set_format_arg(0, money32, peep->paid_on_drink); - set_format_arg(4, uint16_t, peep->AmountOfDrinks); + ft = Formatter::Common(); + ft.Add(peep->paid_on_drink); + ft.Add(peep->AmountOfDrinks); if (peep->AmountOfDrinks != 1) { gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_DRINK_PLURAL, gCommonFormatArgs, COLOUR_BLACK, x, y); @@ -1834,8 +1841,9 @@ void window_guest_finance_paint(rct_window* w, rct_drawpixelinfo* dpi) // Paid on souvenirs y += LIST_ROW_HEIGHT; - set_format_arg(0, money32, peep->PaidOnSouvenirs); - set_format_arg(4, uint16_t, peep->AmountOfSouvenirs); + ft = Formatter::Common(); + ft.Add(peep->PaidOnSouvenirs); + ft.Add(peep->AmountOfSouvenirs); if (peep->AmountOfSouvenirs != 1) { gfx_draw_string_left(dpi, STR_GUEST_EXPENSES_SOUVENIR_PLURAL, gCommonFormatArgs, COLOUR_BLACK, x, y); @@ -2083,7 +2091,8 @@ void window_guest_debug_paint(rct_window* w, rct_drawpixelinfo* dpi) auto screenCoords = ScreenCoordsXY{ w->windowPos.x + window_guest_debug_widgets[WIDX_PAGE_BACKGROUND].left + 4, w->windowPos.y + window_guest_debug_widgets[WIDX_PAGE_BACKGROUND].top + 4 }; { - set_format_arg(0, uint32_t, peep->sprite_index); + auto ft = Formatter::Common(); + ft.Add(peep->sprite_index); gfx_draw_string_left(dpi, STR_PEEP_DEBUG_SPRITE_INDEX, gCommonFormatArgs, 0, screenCoords.x, screenCoords.y); } screenCoords.y += LIST_ROW_HEIGHT; diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index cc42c4337b..4c854856ae 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -725,7 +725,8 @@ static void window_guest_list_paint(rct_window* w, rct_drawpixelinfo* dpi) { x = w->windowPos.x + 4; y = w->windowPos.y + window_guest_list_widgets[WIDX_GUEST_LIST].bottom + 2; - set_format_arg(0, int32_t, static_cast(GuestList.size())); + auto ft = Formatter::Common(); + ft.Add(static_cast(GuestList.size())); gfx_draw_string_left( dpi, (GuestList.size() == 1 ? STR_FORMAT_NUM_GUESTS_SINGULAR : STR_FORMAT_NUM_GUESTS_PLURAL), gCommonFormatArgs, COLOUR_BLACK, x, y); @@ -846,8 +847,9 @@ static void window_guest_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, COLOUR_BLACK, { 0, y }, 414); // Draw guest count - set_format_arg(0, rct_string_id, STR_GUESTS_COUNT_COMMA_SEP); - set_format_arg(2, uint32_t, numGuests); + auto ft = Formatter::Common(); + ft.Add(STR_GUESTS_COUNT_COMMA_SEP); + ft.Add(numGuests); gfx_draw_string_right(dpi, format, gCommonFormatArgs, COLOUR_BLACK, 326, y); } y += SUMMARISED_GUEST_ROW_HEIGHT; diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index 9c1630bb5b..b536d59d00 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -716,7 +716,8 @@ static void window_loadsave_paint(rct_window* w, rct_drawpixelinfo* dpi) safe_strcpy(ch, _shortenedDirectory, sizeof(buffer) - (ch - buffer)); // Draw path text - set_format_arg(0, uintptr_t, Platform::StrDecompToPrecomp(buffer)); + auto ft = Formatter::Common(); + ft.Add(Platform::StrDecompToPrecomp(buffer)); gfx_draw_string_left_clipped( dpi, STR_STRING, gCommonFormatArgs, COLOUR_BLACK, { w->windowPos.x + 4, w->windowPos.y + 20 }, w->width - 8); @@ -1236,8 +1237,9 @@ static void window_overwrite_prompt_paint(rct_window* w, rct_drawpixelinfo* dpi) { window_draw_widgets(w, dpi); - set_format_arg(0, rct_string_id, STR_STRING); - set_format_arg(2, char*, _window_overwrite_prompt_name); + auto ft = Formatter::Common(); + ft.Add(STR_STRING); + ft.Add(_window_overwrite_prompt_name); ScreenCoordsXY stringCoords(w->windowPos.x + w->width / 2, w->windowPos.y + (w->height / 2) - 3); gfx_draw_string_centred_wrapped( diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index b7431b2fd6..ae5698dd75 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -979,7 +979,9 @@ static void window_map_show_default_scenario_editor_buttons(rct_window* w) if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) w->widgets[WIDX_MAP_GENERATOR].type = WWT_BUTTON; - set_format_arg(2, uint16_t, gMapSize - 2); + auto ft = Formatter::Common(); + ft.Increment(2); + ft.Add(gMapSize - 2); } static void window_map_inputsize_land(rct_window* w) diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 216d68ebb9..4ddb1406f5 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -432,7 +432,9 @@ static void window_maze_construction_invalidate(rct_window* w) } else { - set_format_arg(4, rct_string_id, STR_NONE); + auto ft = Formatter::Common(); + ft.Increment(4); + ft.Add(STR_NONE); } } diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 0de33f3f4f..6599443f27 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -284,8 +284,9 @@ static void window_news_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32 dpi, -1, y, 383, y + itemHeight - 1, w->colours[1], (INSET_RECT_FLAG_BORDER_INSET | INSET_RECT_FLAG_FILL_GREY)); // Date text - set_format_arg(0, rct_string_id, DateDayNames[newsItem->Day - 1]); - set_format_arg(2, rct_string_id, DateGameMonthNames[date_get_month(newsItem->MonthYear)]); + auto ft = Formatter::Common(); + ft.Add(DateDayNames[newsItem->Day - 1]); + ft.Add(DateGameMonthNames[date_get_month(newsItem->MonthYear)]); gfx_draw_string_left(dpi, STR_NEWS_DATE_FORMAT, gCommonFormatArgs, COLOUR_WHITE, 2, y); // Item text diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index 9e06202ea0..2145b4496f 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -558,13 +558,15 @@ static void window_object_load_error_paint(rct_window* w, rct_drawpixelinfo* dpi window_draw_widgets(w, dpi); // Draw explanatory message - set_format_arg(0, rct_string_id, STR_OBJECT_ERROR_WINDOW_EXPLANATION); + auto ft = Formatter::Common(); + ft.Add(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); // Draw file name - set_format_arg(0, rct_string_id, STR_OBJECT_ERROR_WINDOW_FILE); - set_format_arg(2, utf8*, file_path.c_str()); + ft = Formatter::Common(); + ft.Add(STR_OBJECT_ERROR_WINDOW_FILE); + ft.Add(file_path.c_str()); gfx_draw_string_left_clipped( dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, { w->windowPos.x + 5, w->windowPos.y + 43 }, WW - 5); } diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 801b3a84de..7ece72d9f4 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -2069,7 +2069,8 @@ static void window_options_paint(rct_window* w, rct_drawpixelinfo* dpi) w->windowPos.x + w->widgets[WIDX_AUTOSAVE_AMOUNT].left + 1, w->windowPos.y + w->widgets[WIDX_AUTOSAVE_AMOUNT].top + 1); - set_format_arg(0, uintptr_t, Platform::StrDecompToPrecomp(gConfigGeneral.rct1_path)); + auto ft = Formatter::Common(); + ft.Add(Platform::StrDecompToPrecomp(gConfigGeneral.rct1_path)); rct_widget pathWidget = window_options_advanced_widgets[WIDX_PATH_TO_RCT1_BUTTON]; @@ -2118,7 +2119,8 @@ static void window_options_tooltip(rct_window* w, rct_widgetindex widgetIndex, r } else { - set_format_arg(0, uintptr_t, reinterpret_cast(gConfigGeneral.rct1_path)); + auto ft = Formatter::Common(); + ft.Add(reinterpret_cast(gConfigGeneral.rct1_path)); } } } diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index a4e8d68663..0952176e27 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -1627,7 +1627,8 @@ static void window_park_objective_paint(rct_window* w, rct_drawpixelinfo* dpi) else { // Objective completed - set_format_arg(0, money32, gScenarioCompletedCompanyValue); + ft = Formatter::Common(); + ft.Add(gScenarioCompletedCompanyValue); gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, { x, y }, 222, STR_OBJECTIVE_ACHIEVED, COLOUR_BLACK); } } diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index 66456823d2..352f49d7cc 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -832,7 +832,9 @@ static void window_title_editor_paint(rct_window* w, rct_drawpixelinfo* dpi) switch (w->selected_tab) { case WINDOW_TITLE_EDITOR_TAB_PRESETS: - set_format_arg(0, uintptr_t, _sequenceName); + { + auto ft = Formatter::Common(); + ft.Add(_sequenceName); gfx_draw_string_left( dpi, STR_TITLE_SEQUENCE, nullptr, w->colours[1], w->windowPos.x + 10, w->windowPos.y + window_title_editor_widgets[WIDX_TITLE_EDITOR_PRESETS].top + 1); @@ -843,6 +845,7 @@ static void window_title_editor_paint(rct_window* w, rct_drawpixelinfo* dpi) w->windowPos.x + window_title_editor_widgets[WIDX_TITLE_EDITOR_PRESETS_DROPDOWN].left - window_title_editor_widgets[WIDX_TITLE_EDITOR_PRESETS].left - 4); break; + } case WINDOW_TITLE_EDITOR_TAB_SAVES: break; case WINDOW_TITLE_EDITOR_TAB_SCRIPT: