From a0619d04cfa9035d0b513766e7aeba9a7ae57224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Breno=20Rodrigues=20Guimar=C3=A3es?= Date: Sat, 25 Apr 2020 18:44:14 -0300 Subject: [PATCH] Replace usage of set_format_arg by Formatter::Common() (#11412) --- src/openrct2-ui/windows/TrackList.cpp | 19 ++++++++++------- src/openrct2-ui/windows/Viewport.cpp | 2 +- src/openrct2/Context.cpp | 2 +- src/openrct2/EditorObjectSelectionSession.cpp | 3 ++- src/openrct2/Game.cpp | 3 ++- src/openrct2/interface/Screenshot.cpp | 5 +++-- src/openrct2/management/Marketing.cpp | 5 +++-- src/openrct2/management/Research.cpp | 13 +++++++----- .../paint/tile_element/Paint.Entrance.cpp | 21 ++++++++++--------- .../paint/tile_element/Paint.LargeScenery.cpp | 9 ++++---- 10 files changed, 47 insertions(+), 35 deletions(-) diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index b48ee789cd..f4d00fe77a 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -453,7 +453,7 @@ static void window_track_list_invalidate(rct_window* w) stringId = rideName.name; } - set_format_arg(0, rct_string_id, stringId); + Formatter::Common().Add(stringId); if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER) { window_track_list_widgets[WIDX_TITLE].text = STR_TRACK_DESIGNS; @@ -622,8 +622,9 @@ static void window_track_list_paint(rct_window* w, rct_drawpixelinfo* dpi) } // Ride length - set_format_arg(0, rct_string_id, STR_RIDE_LENGTH_ENTRY); - set_format_arg(2, uint16_t, _loadedTrackDesign->ride_length); + auto ft = Formatter::Common(); + ft.Add(STR_RIDE_LENGTH_ENTRY); + ft.Add(_loadedTrackDesign->ride_length); gfx_draw_string_left_clipped(dpi, STR_TRACK_LIST_RIDE_LENGTH, gCommonFormatArgs, COLOUR_BLACK, x, y, 214); y += LIST_ROW_HEIGHT; } @@ -683,15 +684,16 @@ static void window_track_list_paint(rct_window* w, rct_drawpixelinfo* dpi) if (_loadedTrackDesign->space_required_x != 0xFF) { // Space required - set_format_arg(0, uint16_t, _loadedTrackDesign->space_required_x); - set_format_arg(2, uint16_t, _loadedTrackDesign->space_required_y); + auto ft = Formatter::Common(); + ft.Add(_loadedTrackDesign->space_required_x); + ft.Add(_loadedTrackDesign->space_required_y); gfx_draw_string_left(dpi, STR_TRACK_LIST_SPACE_REQUIRED, gCommonFormatArgs, COLOUR_BLACK, x, y); y += LIST_ROW_HEIGHT; } if (_loadedTrackDesign->cost != 0) { - set_format_arg(0, uint32_t, _loadedTrackDesign->cost); + Formatter::Common().Add(_loadedTrackDesign->cost); gfx_draw_string_left(dpi, STR_TRACK_LIST_COST_AROUND, gCommonFormatArgs, COLOUR_BLACK, x, y); } } @@ -755,8 +757,9 @@ static void window_track_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, } // Draw track name - set_format_arg(0, rct_string_id, STR_TRACK_LIST_NAME_FORMAT); - set_format_arg(2, utf8*, _trackDesigns[i].name); + auto ft = Formatter::Common(); + ft.Add(STR_TRACK_LIST_NAME_FORMAT); + ft.Add(_trackDesigns[i].name); gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, x, y - 1); } diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp index f0d6f86171..23526685d2 100644 --- a/src/openrct2-ui/windows/Viewport.cpp +++ b/src/openrct2-ui/windows/Viewport.cpp @@ -201,7 +201,7 @@ static void window_viewport_invalidate(rct_window* w) } // Set title - set_format_arg(0, uint32_t, w->number); + Formatter::Common().Add(w->number); // Set disabled widgets w->disabled_widgets = 0; diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 2c5bcf2001..1e91933e97 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -638,7 +638,7 @@ namespace OpenRCT2 } auto windowManager = _uiContext->GetWindowManager(); - set_format_arg(0, uint16_t, e.Flag); + Formatter::Common().Add(e.Flag); windowManager->ShowError(STR_FAILED_TO_LOAD_IMCOMPATIBLE_RCTC_FLAG, STR_NONE); } catch (const std::exception& e) diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp index dd2b1d7ec5..1cdb1119f5 100644 --- a/src/openrct2/EditorObjectSelectionSession.cpp +++ b/src/openrct2/EditorObjectSelectionSession.cpp @@ -506,7 +506,8 @@ int32_t window_editor_object_selection_select_object(uint8_t bh, int32_t flags, { char objectName[64]; object_create_identifier_name(objectName, 64, &item->ObjectEntry); - set_format_arg(0, const char*, objectName); + auto ft = Formatter::Common(); + ft.Add(objectName); set_object_selection_error(bh, STR_OBJECT_SELECTION_ERR_SHOULD_SELECT_X_FIRST); return 0; } diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 1fc07b9b05..c323435ec7 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -462,7 +462,8 @@ void game_fix_save_vars() peep->current_ride = RIDE_ID_NULL; continue; } - set_format_arg(0, uint32_t, peep->id); + auto ft = Formatter::Common(); + ft.Add(peep->id); auto curName = peep->GetName(); log_warning( "Peep %u (%s) has invalid ride station = %u for ride %u.", spriteIndex, curName.c_str(), srcStation, rideIdx); diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index af0a291527..73f8fdc04a 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -429,8 +429,9 @@ void screenshot_giant() WriteDpiToFile(path->c_str(), &dpi, renderedPalette); // Show user that screenshot saved successfully - set_format_arg(0, rct_string_id, STR_STRING); - set_format_arg(2, char*, path_get_filename(path->c_str())); + auto ft = Formatter::Common(); + ft.Add(STR_STRING); + ft.Add(path_get_filename(path->c_str())); context_show_error(STR_SCREENSHOT_SAVED_AS, STR_NONE); } catch (const std::exception& e) diff --git a/src/openrct2/management/Marketing.cpp b/src/openrct2/management/Marketing.cpp index 8c650af40b..ccd139a9d3 100644 --- a/src/openrct2/management/Marketing.cpp +++ b/src/openrct2/management/Marketing.cpp @@ -70,18 +70,19 @@ static void marketing_raise_finished_notification(const MarketingCampaign& campa { if (gConfigNotifications.park_marketing_campaign_finished) { + auto ft = Formatter::Common(); // This sets the string parameters for the marketing types that have an argument. if (campaign.Type == ADVERTISING_CAMPAIGN_RIDE_FREE || campaign.Type == ADVERTISING_CAMPAIGN_RIDE) { auto ride = get_ride(campaign.RideId); if (ride != nullptr) { - ride->FormatNameTo(gCommonFormatArgs); + ride->FormatNameTo(ft); } } else if (campaign.Type == ADVERTISING_CAMPAIGN_FOOD_OR_DRINK_FREE) { - set_format_arg(0, rct_string_id, ShopItems[campaign.ShopItemType].Naming.Plural); + ft.Add(ShopItems[campaign.ShopItemType].Naming.Plural); } news_item_add_to_queue(NEWS_ITEM_MONEY, MarketingCampaignNames[campaign.Type][2], 0); diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 423129e0e2..f8552ccbe4 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -254,11 +254,13 @@ void research_finish_item(ResearchItem* researchItem) } } + auto ft = Formatter::Common(); + // If a vehicle should be listed separately (maze, mini golf, flat rides, shops) if (RideTypeDescriptors[base_ride_type].HasFlag(RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY)) { availabilityString = STR_NEWS_ITEM_RESEARCH_NEW_RIDE_AVAILABLE; - set_format_arg(0, rct_string_id, rideEntry->naming.name); + ft.Add(rideEntry->naming.name); } // If a vehicle is the first to be invented for its ride group, show the ride group name. else if ( @@ -268,7 +270,7 @@ void research_finish_item(ResearchItem* researchItem) { rct_ride_name naming = get_ride_naming(base_ride_type, rideEntry); availabilityString = STR_NEWS_ITEM_RESEARCH_NEW_RIDE_AVAILABLE; - set_format_arg(0, rct_string_id, naming.name); + ft.Add(naming.name); } // If the vehicle should not be listed separately and it isn't the first to be invented for its ride group, // report it as a new vehicle for the existing ride group. @@ -277,8 +279,8 @@ void research_finish_item(ResearchItem* researchItem) availabilityString = STR_NEWS_ITEM_RESEARCH_NEW_VEHICLE_AVAILABLE; rct_ride_name baseRideNaming = get_ride_naming(base_ride_type, rideEntry); - set_format_arg(0, rct_string_id, baseRideNaming.name); - set_format_arg(2, rct_string_id, rideEntry->naming.name); + ft.Add(baseRideNaming.name); + ft.Add(rideEntry->naming.name); } if (!gSilentResearch) @@ -300,7 +302,8 @@ void research_finish_item(ResearchItem* researchItem) { scenery_group_set_invented(researchItem->entryIndex); - set_format_arg(0, rct_string_id, sceneryGroupEntry->name); + auto ft = Formatter::Common(); + ft.Add(sceneryGroupEntry->name); if (!gSilentResearch) { diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index 834528b695..242ed43c5e 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -165,16 +165,17 @@ static void ride_entrance_exit_paint(paint_session* session, uint8_t direction, if (!is_exit && !(tile_element->IsGhost()) && tile_element->AsEntrance()->GetRideIndex() != RIDE_ID_NULL && stationObj->ScrollingMode != SCROLLING_MODE_NONE) { - set_format_arg(0, rct_string_id, STR_RIDE_ENTRANCE_NAME); - set_format_arg(4, uint32_t, 0); + auto ft = Formatter::Common(); + ft.Add(STR_RIDE_ENTRANCE_NAME); + ft.Add(0); if (ride->status == RIDE_STATUS_OPEN && !(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)) { - ride->FormatNameTo(gCommonFormatArgs + 2); + ride->FormatNameTo(ft); } else { - set_format_arg(2, rct_string_id, STR_RIDE_ENTRANCE_CLOSED); + ft.Add(STR_RIDE_ENTRANCE_CLOSED); } utf8 entrance_string[256]; @@ -270,20 +271,20 @@ static void park_entrance_paint(paint_session* session, uint8_t direction, int32 break; { - set_format_arg(0, uint32_t, 0); - set_format_arg(4, uint32_t, 0); + Formatter::Common().Add(0).Add(0); + auto ft = Formatter::Common(); if (gParkFlags & PARK_FLAGS_PARK_OPEN) { const auto& park = OpenRCT2::GetContext()->GetGameState()->GetPark(); auto name = park.Name.c_str(); - set_format_arg(0, rct_string_id, STR_STRING); - set_format_arg(2, const char*, name); + ft.Add(STR_STRING); + ft.Add(name); } else { - set_format_arg(0, rct_string_id, STR_BANNER_TEXT_CLOSED); - set_format_arg(2, uint32_t, 0); + ft.Add(STR_BANNER_TEXT_CLOSED); + ft.Add(0); } utf8 park_name[256]; diff --git a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp index b121d882af..84fd4d45cd 100644 --- a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp @@ -301,8 +301,7 @@ void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t hei } // 6B8331: // Draw sign text: - set_format_arg(0, uint32_t, 0); - set_format_arg(4, uint32_t, 0); + Formatter::Common().Add(0).Add(0); int32_t textColour = tileElement->AsLargeScenery()->GetSecondaryColour(); if (dword_F4387C) { @@ -312,7 +311,8 @@ void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t hei auto banner = tileElement->AsLargeScenery()->GetBanner(); if (banner != nullptr) { - banner->FormatTextTo(gCommonFormatArgs); + auto ft = Formatter::Common(); + banner->FormatTextTo(ft); utf8 signString[256]; format_string(signString, sizeof(signString), STR_STRINGID, gCommonFormatArgs); rct_large_scenery_text* text = entry->large_scenery.text; @@ -429,7 +429,8 @@ void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t hei auto banner = tileElement->AsLargeScenery()->GetBanner(); if (banner != nullptr) { - banner->FormatTextTo(gCommonFormatArgs); + auto ft = Formatter::Common(); + banner->FormatTextTo(ft); utf8 signString[256]; if (gConfigGeneral.upper_case_banners) {