mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Migrate 50 more calls to set_format_arg()

This commit is contained in:
Gymnasiast 2020-06-03 11:20:29 +02:00
parent f640446d58
commit 02338ffc5c
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
10 changed files with 130 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/windows/Finances.cpp
View File

@ -653,7 +653,9 @@ static void window_finances_summary_invalidate(rct_window* w)
window_finances_summary_invertscroll(w);
window_finances_set_pressed_tab(w);
set_format_arg(6, money32, gBankLoan);
auto ft = Formatter::Common();
ft.Increment(6);
ft.Add<money32>(gBankLoan);
}
/**

58
src/openrct2-ui/windows/Guest.cpp
View File

@ -1518,7 +1518,8 @@ void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
int32_t eax = gScenarioTicks;
eax -= peep->time_in_park;
eax >>= 11;
set_format_arg(0, uint16_t, eax & 0xFFFF);
auto ft = Formatter::Common();
ft.Add<uint16_t>(eax & 0xFFFF);
gfx_draw_string_left(dpi, STR_GUEST_STAT_TIME_IN_PARK, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
@ -1530,17 +1531,21 @@ void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
y += LIST_ROW_HEIGHT;
// Intensity
auto ft = Formatter::Common();
auto maxIntensity = peep->intensity.GetMaximum();
set_format_arg(0, uint16_t, maxIntensity);
int32_t string_id = STR_GUEST_STAT_PREFERRED_INTESITY_BELOW;
if (peep->intensity.GetMinimum() != 0)
{
set_format_arg(0, uint16_t, peep->intensity.GetMinimum());
set_format_arg(2, uint16_t, maxIntensity);
ft.Add<uint16_t>(peep->intensity.GetMinimum());
ft.Add<uint16_t>(maxIntensity);
string_id = STR_GUEST_STAT_PREFERRED_INTESITY_BETWEEN;
if (maxIntensity == 15)
string_id = STR_GUEST_STAT_PREFERRED_INTESITY_ABOVE;
}
else
{
ft.Add<uint16_t>(maxIntensity);
}
gfx_draw_string_left(dpi, string_id, gCommonFormatArgs, COLOUR_BLACK, x + 4, y);
@ -1553,7 +1558,7 @@ void window_guest_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
};
y += LIST_ROW_HEIGHT;
int32_t nausea_tolerance = peep->nausea_tolerance & 0x3;
set_format_arg(0, rct_string_id, nauseaTolerances[nausea_tolerance]);
ft.Add<rct_string_id>(nauseaTolerances[nausea_tolerance]);
gfx_draw_string_left(dpi, STR_GUEST_STAT_NAUSEA_TOLERANCE, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
@ -1942,17 +1947,19 @@ static rct_string_id window_guest_inventory_format_item(Peep* peep, int32_t item
auto parkName = park.Name.c_str();
// Default arguments
set_format_arg(0, uint32_t, ShopItems[item].Image);
set_format_arg(4, rct_string_id, ShopItems[item].Naming.Display);
set_format_arg(6, rct_string_id, STR_STRING);
set_format_arg(8, const char*, parkName);
auto ft = Formatter::Common();
ft.Add<uint32_t>(ShopItems[item].Image);
ft.Add<rct_string_id>(ShopItems[item].Naming.Display);
ft.Add<rct_string_id>(STR_STRING);
ft.Add<const char*>(parkName);
// Special overrides
Ride* ride{};
switch (item)
{
case SHOP_ITEM_BALLOON:
set_format_arg(0, uint32_t, SPRITE_ID_PALETTE_COLOUR_1(peep->BalloonColour) | ShopItems[item].Image);
ft.Increment(-ft.NumBytes());
ft.Add<uint32_t>(SPRITE_ID_PALETTE_COLOUR_1(peep->BalloonColour) | ShopItems[item].Image);
break;
case SHOP_ITEM_PHOTO:
ride = get_ride(peep->photo1_ride_ref);
@ -1960,40 +1967,47 @@ static rct_string_id window_guest_inventory_format_item(Peep* peep, int32_t item
ride->FormatNameTo(gCommonFormatArgs + 6);
break;
case SHOP_ITEM_UMBRELLA:
set_format_arg(0, uint32_t, SPRITE_ID_PALETTE_COLOUR_1(peep->UmbrellaColour) | ShopItems[item].Image);
ft.Increment(-ft.NumBytes());
ft.Add<uint32_t>(SPRITE_ID_PALETTE_COLOUR_1(peep->UmbrellaColour) | ShopItems[item].Image);
break;
case SHOP_ITEM_VOUCHER:
switch (peep->VoucherType)
{
case VOUCHER_TYPE_PARK_ENTRY_FREE:
set_format_arg(6, rct_string_id, STR_PEEP_INVENTORY_VOUCHER_PARK_ENTRY_FREE);
set_format_arg(8, rct_string_id, STR_STRING);
set_format_arg(10, const char*, parkName);
ft.Increment(-ft.NumBytes() + 6);
ft.Add<rct_string_id>(STR_PEEP_INVENTORY_VOUCHER_PARK_ENTRY_FREE);
ft.Add<rct_string_id>(STR_STRING);
ft.Add<const char*>(parkName);
break;
case VOUCHER_TYPE_RIDE_FREE:
ride = get_ride(peep->VoucherArguments);
if (ride != nullptr)
{
set_format_arg(6, rct_string_id, STR_PEEP_INVENTORY_VOUCHER_RIDE_FREE);
ft.Increment(-ft.NumBytes() + 6);
ft.Add<rct_string_id>(STR_PEEP_INVENTORY_VOUCHER_RIDE_FREE);
ride->FormatNameTo(gCommonFormatArgs + 8);
}
break;
case VOUCHER_TYPE_PARK_ENTRY_HALF_PRICE:
set_format_arg(6, rct_string_id, STR_PEEP_INVENTORY_VOUCHER_PARK_ENTRY_HALF_PRICE);
set_format_arg(8, rct_string_id, STR_STRING);
set_format_arg(10, const char*, parkName);
ft.Increment(-ft.NumBytes() + 6);
ft.Add<rct_string_id>(STR_PEEP_INVENTORY_VOUCHER_PARK_ENTRY_HALF_PRICE);
ft.Add<rct_string_id>(STR_STRING);
ft.Add<const char*>(parkName);
break;
case VOUCHER_TYPE_FOOD_OR_DRINK_FREE:
set_format_arg(6, rct_string_id, STR_PEEP_INVENTORY_VOUCHER_FOOD_OR_DRINK_FREE);
set_format_arg(8, rct_string_id, ShopItems[peep->VoucherArguments].Naming.Singular);
ft.Increment(-ft.NumBytes() + 6);
ft.Add<rct_string_id>(STR_PEEP_INVENTORY_VOUCHER_FOOD_OR_DRINK_FREE);
ft.Add<rct_string_id>(ShopItems[peep->VoucherArguments].Naming.Singular);
break;
}
break;
case SHOP_ITEM_HAT:
set_format_arg(0, uint32_t, SPRITE_ID_PALETTE_COLOUR_1(peep->HatColour) | ShopItems[item].Image);
ft.Increment(-ft.NumBytes());
ft.Add<uint32_t>(SPRITE_ID_PALETTE_COLOUR_1(peep->HatColour) | ShopItems[item].Image);
break;
case SHOP_ITEM_TSHIRT:
set_format_arg(0, uint32_t, SPRITE_ID_PALETTE_COLOUR_1(peep->tshirt_colour) | ShopItems[item].Image);
ft.Increment(-ft.NumBytes());
ft.Add<uint32_t>(SPRITE_ID_PALETTE_COLOUR_1(peep->tshirt_colour) | ShopItems[item].Image);
break;
case SHOP_ITEM_PHOTO2:
ride = get_ride(peep->photo2_ride_ref);

4
src/openrct2-ui/windows/GuestList.cpp
View File

@ -659,7 +659,9 @@ static void window_guest_list_invalidate(rct_window* w)
{
window_guest_list_widgets[WIDX_PAGE_DROPDOWN].type = WWT_DROPDOWN;
window_guest_list_widgets[WIDX_PAGE_DROPDOWN_BUTTON].type = WWT_BUTTON;
set_format_arg(4, uint16_t, _window_guest_list_selected_page + 1);
auto ft = Formatter::Common();
ft.Increment(4);
ft.Add<uint16_t>(_window_guest_list_selected_page + 1);
}
else
{

13
src/openrct2-ui/windows/InstallTrack.cpp
View File

@ -320,8 +320,9 @@ static void window_install_track_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, td6->ride_length);
auto ft = Formatter::Common();
ft.Add<rct_string_id>(STR_RIDE_LENGTH_ENTRY);
ft.Add<uint16_t>(td6->ride_length);
gfx_draw_string_left_clipped(dpi, STR_TRACK_LIST_RIDE_LENGTH, gCommonFormatArgs, COLOUR_BLACK, { x, y }, 214);
y += LIST_ROW_HEIGHT;
}
@ -379,15 +380,17 @@ static void window_install_track_paint(rct_window* w, rct_drawpixelinfo* dpi)
if (td6->space_required_x != 0xFF)
{
// Space required
set_format_arg(0, uint16_t, td6->space_required_x);
set_format_arg(2, uint16_t, td6->space_required_y);
auto ft = Formatter::Common();
ft.Add<uint16_t>(td6->space_required_x);
ft.Add<uint16_t>(td6->space_required_y);
gfx_draw_string_left(dpi, STR_TRACK_LIST_SPACE_REQUIRED, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += LIST_ROW_HEIGHT;
}
if (td6->cost != 0)
{
set_format_arg(0, uint32_t, td6->cost);
auto ft = Formatter::Common();
ft.Add<uint32_t>(td6->cost);
gfx_draw_string_left(dpi, STR_TRACK_LIST_COST_AROUND, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
}

17
src/openrct2-ui/windows/LoadSave.cpp
View File

@ -773,25 +773,30 @@ static void window_loadsave_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, i
// display a marker next to the currently loaded game file
if (_listItems[i].loaded)
{
set_format_arg(0, rct_string_id, STR_RIGHTGUILLEMET);
auto ft = Formatter::Common();
ft.Add<rct_string_id>(STR_RIGHTGUILLEMET);
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, 0, y);
}
// Print filename
set_format_arg(0, rct_string_id, STR_STRING);
set_format_arg(2, char*, _listItems[i].name.c_str());
auto ft = Formatter::Common();
ft.Add<rct_string_id>(STR_STRING);
ft.Add<char*>(_listItems[i].name.c_str());
int32_t max_file_width = w->widgets[WIDX_SORT_NAME].right - w->widgets[WIDX_SORT_NAME].left - 10;
gfx_draw_string_left_clipped(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, { 10, y }, max_file_width);
// Print formatted modified date, if this is a file
if (_listItems[i].type == TYPE_FILE)
{
set_format_arg(0, rct_string_id, STR_STRING);
set_format_arg(2, char*, _listItems[i].date_formatted.c_str());
ft = Formatter::Common();
ft.Add<rct_string_id>(STR_STRING);
ft.Add<char*>(_listItems[i].date_formatted.c_str());
gfx_draw_string_right_clipped(
dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, { dateAnchor - DATE_TIME_GAP, y }, maxDateWidth);
set_format_arg(2, char*, _listItems[i].time_formatted.c_str());
ft = Formatter::Common();
ft.Add<rct_string_id>(STR_STRING);
ft.Add<char*>(_listItems[i].time_formatted.c_str());
gfx_draw_string_left_clipped(
dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, { dateAnchor + DATE_TIME_GAP, y }, maxTimeWidth);
}

17
src/openrct2-ui/windows/Multiplayer.cpp
View File

@ -696,10 +696,14 @@ static void window_multiplayer_players_scrollpaint(rct_window* w, rct_drawpixeli
// Draw last action
int32_t action = network_get_player_last_action(i, 2000);
set_format_arg(0, rct_string_id, STR_ACTION_NA);
auto ft = Formatter::Common();
if (action != -999)
{
set_format_arg(0, rct_string_id, network_get_action_name_string_id(action));
ft.Add<rct_string_id>(network_get_action_name_string_id(action));
}
else
{
ft.Add<rct_string_id>(STR_ACTION_NA);
}
gfx_draw_string_left_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, { 256, screenCoords.y }, 100);
@ -910,7 +914,8 @@ static void window_multiplayer_groups_paint(rct_window* w, rct_drawpixelinfo* dp
lineCh = buffer;
lineCh = utf8_write_codepoint(lineCh, FORMAT_WINDOW_COLOUR_2);
safe_strcpy(lineCh, network_get_group_name(group), sizeof(buffer) - (lineCh - buffer));
set_format_arg(0, const char*, buffer);
auto ft = Formatter::Common();
ft.Add<const char*>(buffer);
gfx_draw_string_centred_clipped(
dpi, STR_STRING, gCommonFormatArgs, COLOUR_BLACK, w->windowPos.x + (widget->left + widget->right - 11) / 2,
w->windowPos.y + widget->top, widget->right - widget->left - 8);
@ -934,7 +939,8 @@ static void window_multiplayer_groups_paint(rct_window* w, rct_drawpixelinfo* dp
lineCh = buffer;
lineCh = utf8_write_codepoint(lineCh, FORMAT_WINDOW_COLOUR_2);
safe_strcpy(lineCh, network_get_group_name(group), sizeof(buffer) - (lineCh - buffer));
set_format_arg(0, const char*, buffer);
auto ft = Formatter::Common();
ft.Add<const char*>(buffer);
gfx_draw_string_centred_clipped(
dpi, STR_STRING, gCommonFormatArgs, COLOUR_BLACK, w->windowPos.x + (widget->left + widget->right - 11) / 2,
w->windowPos.y + widget->top, widget->right - widget->left - 8);
@ -975,7 +981,8 @@ static void window_multiplayer_groups_scrollpaint(rct_window* w, rct_drawpixelin
}
// Draw action name
set_format_arg(0, uint16_t, network_get_action_name_string_id(i));
auto ft = Formatter::Common();
ft.Add<uint16_t>(network_get_action_name_string_id(i));
gfx_draw_string_left(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, 10, screenCoords.y);
}
screenCoords.y += SCROLLABLE_ROW_HEIGHT;

21
src/openrct2-ui/windows/Options.cpp
View File

@ -1605,8 +1605,10 @@ static void window_options_invalidate(rct_window* w)
case WINDOW_OPTIONS_PAGE_DISPLAY:
{
// Resolution dropdown caption.
set_format_arg(16, uint16_t, static_cast<uint16_t>(gConfigGeneral.fullscreen_width));
set_format_arg(18, uint16_t, static_cast<uint16_t>(gConfigGeneral.fullscreen_height));
auto ft = Formatter::Common();
ft.Increment(16);
ft.Add<uint16_t>(static_cast<uint16_t>(gConfigGeneral.fullscreen_width));
ft.Add<uint16_t>(static_cast<uint16_t>(gConfigGeneral.fullscreen_height));
// Disable resolution dropdown on "Windowed" and "Fullscreen (desktop)"
if (gConfigGeneral.fullscreen_mode != static_cast<int32_t>(OpenRCT2::Ui::FULLSCREEN_MODE::FULLSCREEN))
@ -1729,8 +1731,10 @@ static void window_options_invalidate(rct_window* w)
}
case WINDOW_OPTIONS_PAGE_CULTURE:
{
// Language
set_format_arg(0, char*, LanguagesDescriptors[LocalisationService_GetCurrentLanguage()].native_name);
auto ft = Formatter::Common();
ft.Add<char*>(LanguagesDescriptors[LocalisationService_GetCurrentLanguage()].native_name);
// Currency: pounds, dollars, etc. (10 total)
window_options_culture_widgets[WIDX_CURRENCY].text = CurrencyDescriptors[gConfigGeneral.currency_format].stringId;
@ -1767,7 +1771,7 @@ static void window_options_invalidate(rct_window* w)
: STR_REAL_VALUES;
break;
}
case WINDOW_OPTIONS_PAGE_AUDIO:
{
// Sound device
@ -1793,7 +1797,8 @@ static void window_options_invalidate(rct_window* w)
}
window_options_audio_widgets[WIDX_SOUND].text = audioDeviceStringId;
set_format_arg(0, char*, audioDeviceName);
auto ft = Formatter::Common();
ft.Add<char*>(audioDeviceName);
window_options_audio_widgets[WIDX_TITLE_MUSIC].text = window_options_title_music_names[gConfigSound.title_music];
@ -1830,7 +1835,8 @@ static void window_options_invalidate(rct_window* w)
size_t activeAvailableThemeIndex = theme_manager_get_active_available_theme_index();
const utf8* activeThemeName = theme_manager_get_available_theme_name(activeAvailableThemeIndex);
set_format_arg(0, uintptr_t, reinterpret_cast<uintptr_t>(activeThemeName));
auto ft = Formatter::Common();
ft.Add<uintptr_t>(reinterpret_cast<uintptr_t>(activeThemeName));
break;
}
@ -1838,7 +1844,8 @@ static void window_options_invalidate(rct_window* w)
case WINDOW_OPTIONS_PAGE_MISC:
{
const utf8* name = title_sequence_manager_get_name(title_get_config_sequence());
set_format_arg(0, uintptr_t, reinterpret_cast<uintptr_t>(name));
auto ft = Formatter::Common();
ft.Add<uintptr_t>(reinterpret_cast<uintptr_t>(name));
// The real name setting of clients is fixed to that of the server
// and the server cannot change the setting during gameplay to prevent desyncs

9
src/openrct2-ui/windows/Park.cpp
View File

@ -1429,14 +1429,16 @@ static void window_park_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
stringIndex = STR_PARK_SIZE_IMPERIAL_LABEL;
parkSize = squaredmetres_to_squaredfeet(parkSize);
}
set_format_arg(0, uint32_t, parkSize);
auto ft = Formatter::Common();
ft.Add<uint32_t>(parkSize);
gfx_draw_string_left(dpi, stringIndex, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += LIST_ROW_HEIGHT;
// Draw number of rides / attractions
if (w->list_information_type != 0xFFFF)
{
set_format_arg(0, uint32_t, w->list_information_type);
ft = Formatter::Common();
ft.Add<uint32_t>(w->list_information_type);
gfx_draw_string_left(dpi, STR_NUMBER_OF_RIDES_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
y += LIST_ROW_HEIGHT;
@ -1444,7 +1446,8 @@ static void window_park_stats_paint(rct_window* w, rct_drawpixelinfo* dpi)
// Draw number of staff
if (w->numberOfStaff != -1)
{
set_format_arg(0, uint32_t, w->numberOfStaff);
ft = Formatter::Common();
ft.Add<uint32_t>(w->numberOfStaff);
gfx_draw_string_left(dpi, STR_STAFF_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
y += LIST_ROW_HEIGHT;

25
src/openrct2-ui/windows/Player.cpp
View File

@ -374,7 +374,8 @@ void window_player_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
lineCh = buffer;
lineCh = utf8_write_codepoint(lineCh, FORMAT_WINDOW_COLOUR_2);
safe_strcpy(lineCh, network_get_group_name(groupindex), sizeof(buffer) - (lineCh - buffer));
set_format_arg(0, const char*, buffer);
auto ft = Formatter::Common();
ft.Add<const char*>(buffer);
gfx_draw_string_centred_clipped(
dpi, STR_STRING, gCommonFormatArgs, COLOUR_BLACK, w->windowPos.x + (widget->left + widget->right - 11) / 2,
@ -384,7 +385,8 @@ void window_player_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
// Draw ping
auto screenCoords = ScreenCoordsXY{ w->windowPos.x + 90, w->windowPos.y + 24 };
set_format_arg(0, rct_string_id, STR_PING);
auto ft = Formatter::Common();
ft.Add<rct_string_id>(STR_PING);
gfx_draw_string_left(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, 0, screenCoords.x, screenCoords.y);
char ping[64];
snprintf(ping, 64, "%d ms", network_get_player_ping(player));
@ -394,10 +396,14 @@ void window_player_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
screenCoords = { w->windowPos.x + (w->width / 2), w->windowPos.y + w->height - 13 };
int32_t width = w->width - 8;
int32_t lastaction = network_get_player_last_action(player, 0);
set_format_arg(0, rct_string_id, STR_ACTION_NA);
ft = Formatter::Common();
if (lastaction != -999)
{
set_format_arg(0, rct_string_id, network_get_action_name_string_id(lastaction));
ft.Add<rct_string_id>(network_get_action_name_string_id(lastaction));
}
else
{
ft.Add<rct_string_id>(STR_ACTION_NA);
}
gfx_draw_string_centred_clipped(
dpi, STR_LAST_ACTION_RAN, gCommonFormatArgs, COLOUR_BLACK, screenCoords.x, screenCoords.y, width);
@ -546,12 +552,14 @@ void window_player_statistics_paint(rct_window* w, rct_drawpixelinfo* dpi)
int32_t x = w->windowPos.x + window_player_overview_widgets[WIDX_PAGE_BACKGROUND].left + 4;
int32_t y = w->windowPos.y + window_player_overview_widgets[WIDX_PAGE_BACKGROUND].top + 4;
set_format_arg(0, uint32_t, network_get_player_commands_ran(player));
auto ft = Formatter::Common();
ft.Add<uint32_t>(network_get_player_commands_ran(player));
gfx_draw_string_left(dpi, STR_COMMANDS_RAN, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += LIST_ROW_HEIGHT;
set_format_arg(0, uint32_t, network_get_player_money_spent(player));
ft = Formatter::Common();
ft.Add<uint32_t>(network_get_player_money_spent(player));
gfx_draw_string_left(dpi, STR_MONEY_SPENT, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
@ -682,13 +690,14 @@ static void window_player_update_viewport(rct_window* w, bool scroll)
static void window_player_update_title(rct_window* w)
{
auto ft = Formatter::Common();
int32_t player = network_get_player_index(static_cast<uint8_t>(w->number));
if (player != -1)
{
set_format_arg(0, const char*, network_get_player_name(player)); // set title caption to player name
ft.Add<const char*>(network_get_player_name(player)); // set title caption to player name
}
else
{
set_format_arg(0, const char*, "");
ft.Add<const char*>("");
}
}

33
src/openrct2-ui/windows/Ride.cpp
View File

@ -4954,11 +4954,13 @@ static void window_ride_colour_invalidate(rct_window* w)
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_SCHEME].type = WWT_EMPTY;
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN].type = WWT_EMPTY;
}
set_format_arg(6, rct_string_id, VehicleColourSchemeNames[vehicleColourSchemeType]);
set_format_arg(8, rct_string_id, RideComponentNames[RideTypeDescriptors[ride->type].NameConvention.vehicle].singular);
set_format_arg(
10, rct_string_id, RideComponentNames[RideTypeDescriptors[ride->type].NameConvention.vehicle].capitalised);
set_format_arg(12, uint16_t, w->vehicleIndex + 1);
auto ft = Formatter::Common();
ft.Increment(6);
ft.Add<rct_string_id>(VehicleColourSchemeNames[vehicleColourSchemeType]);
ft.Add<rct_string_id>(RideComponentNames[RideTypeDescriptors[ride->type].NameConvention.vehicle].singular);
ft.Add<rct_string_id>(RideComponentNames[RideTypeDescriptors[ride->type].NameConvention.vehicle].capitalised);
ft.Add<uint16_t>(w->vehicleIndex + 1);
// Vehicle index
if (vehicleColourSchemeType != 0)
{
@ -4986,7 +4988,9 @@ static void window_ride_colour_invalidate(rct_window* w)
window_ride_colour_widgets[WIDX_VEHICLE_ADDITIONAL_COLOUR_2].type = WWT_EMPTY;
}
set_format_arg(14, rct_string_id, ColourSchemeNames[colourScheme]);
auto ft = Formatter::Common();
ft.Increment(14);
ft.Add<rct_string_id>(ColourSchemeNames[colourScheme]);
window_ride_anchor_border_widgets(w);
window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_10);
@ -6090,9 +6094,10 @@ static void window_ride_graphs_tooltip(rct_window* w, rct_widgetindex widgetInde
auto [measurement, message] = ride_get_measurement(ride);
if (measurement != nullptr && (measurement->flags & RIDE_MEASUREMENT_FLAG_RUNNING))
{
set_format_arg(4, uint16_t, measurement->vehicle_index + 1);
set_format_arg(
2, rct_string_id, RideComponentNames[RideTypeDescriptors[ride->type].NameConvention.vehicle].count);
auto ft = Formatter::Common();
ft.Increment(2);
ft.Add<rct_string_id>(RideComponentNames[RideTypeDescriptors[ride->type].NameConvention.vehicle].count);
ft.Add<uint16_t>(measurement->vehicle_index + 1);
}
else
{
@ -7048,8 +7053,9 @@ static void window_ride_customer_paint(rct_window* w, rct_drawpixelinfo* dpi)
shopItem = ride->GetRideEntry()->shop_item[0];
if (shopItem != SHOP_ITEM_NONE)
{
set_format_arg(0, rct_string_id, ShopItems[shopItem].Naming.Plural);
set_format_arg(2, uint32_t, ride->no_primary_items_sold);
auto ft = Formatter::Common();
ft.Add<rct_string_id>(ShopItems[shopItem].Naming.Plural);
ft.Add<uint32_t>(ride->no_primary_items_sold);
gfx_draw_string_left(dpi, STR_ITEMS_SOLD, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += LIST_ROW_HEIGHT;
}
@ -7059,8 +7065,9 @@ static void window_ride_customer_paint(rct_window* w, rct_drawpixelinfo* dpi)
: ride->GetRideEntry()->shop_item[1];
if (shopItem != SHOP_ITEM_NONE)
{
set_format_arg(0, rct_string_id, ShopItems[shopItem].Naming.Plural);
set_format_arg(2, uint32_t, ride->no_secondary_items_sold);
auto ft = Formatter::Common();
ft.Add<rct_string_id>(ShopItems[shopItem].Naming.Plural);
ft.Add<uint32_t>(ride->no_secondary_items_sold);
gfx_draw_string_left(dpi, STR_ITEMS_SOLD, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += LIST_ROW_HEIGHT;
}