mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 01:35:06 +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

7
src/openrct2-ui/windows/EditorInventionsList.cpp
View File

@@ -830,6 +830,7 @@ static rct_string_id window_editor_inventions_list_prepare_name(const ResearchIt
{
rct_string_id drawString;
rct_string_id stringId = researchItem->GetName();
auto ft = Formatter::Common();
if (researchItem->type == RESEARCH_ENTRY_TYPE_RIDE
&& !RideTypeDescriptors[researchItem->baseRideType].HasFlag(RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY))
@@ -837,13 +838,13 @@ static rct_string_id window_editor_inventions_list_prepare_name(const ResearchIt
drawString = withGap ? STR_INVENTIONS_LIST_RIDE_AND_VEHICLE_NAME_DRAG : STR_WINDOW_COLOUR_2_STRINGID_STRINGID;
rct_string_id rideGroupName = get_ride_naming(researchItem->baseRideType, get_ride_entry(researchItem->entryIndex))
.name;
set_format_arg(0, rct_string_id, rideGroupName);
set_format_arg(2, rct_string_id, stringId);
ft.Add<rct_string_id>(rideGroupName);
ft.Add<rct_string_id>(stringId);
}
else
{
drawString = STR_WINDOW_COLOUR_2_STRINGID;
set_format_arg(0, rct_string_id, stringId);
ft.Add<rct_string_id>(stringId);
}
return drawString;