mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00
Code Issues Releases Wiki Activity

Migrate many set_format_arg calls to Formatter (#11744)

Browse Source
This commit is contained in:
Michael Steenbeek
2020-05-14 02:29:39 +02:00
committed by GitHub
parent f0bd05cf6d
commit 620fb5e5c4
23 changed files with 122 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@@ -785,7 +785,8 @@ static void window_editor_object_selection_tooltip(rct_window* w, rct_widgetinde
{
if (widgetIndex >= WIDX_TAB_1 && static_cast<size_t>(widgetIndex) < WIDX_TAB_1 + std::size(ObjectSelectionPages))
{
set_format_arg(0, rct_string_id, ObjectSelectionPages[(widgetIndex - WIDX_TAB_1)].Caption);
auto ft = Formatter::Common();
ft.Add<rct_string_id>(ObjectSelectionPages[(widgetIndex - WIDX_TAB_1)].Caption);
}
}
@@ -823,7 +824,8 @@ static void window_editor_object_selection_invalidate(rct_window* w)
w->pressed_widgets &= ~(1 << WIDX_ADVANCED);
// Set window title and buttons
set_format_arg(0, rct_string_id, ObjectSelectionPages[w->selected_tab].Caption);
auto ft = Formatter::Common();
ft.Add<rct_string_id>(ObjectSelectionPages[w->selected_tab].Caption);
if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)
{
w->widgets[WIDX_TITLE].text = STR_TRACK_DESIGNS_MANAGER_SELECT_RIDE_TYPE;