mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity

Move storage into Formatter class and refactor usage

Browse Source
This commit is contained in:
Matt
2020-08-26 22:54:12 +02:00
parent 1982e8491b
commit 2639349925
13 changed files with 62 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2-ui/windows/ObjectLoadError.cpp
View File

@@ -111,14 +111,13 @@ private:
else
{
char str_downloading_objects[256]{};
uint8_t args[32]{};
Formatter ft(args);
Formatter ft;
if (_downloadStatusInfo.Source.empty())
{
ft.Add<int16_t>(static_cast<int16_t>(_downloadStatusInfo.Count));
ft.Add<int16_t>(static_cast<int16_t>(_downloadStatusInfo.Total));
ft.Add<char*>(_downloadStatusInfo.Name.c_str());
format_string(str_downloading_objects, sizeof(str_downloading_objects), STR_DOWNLOADING_OBJECTS, args);
format_string(str_downloading_objects, sizeof(str_downloading_objects), STR_DOWNLOADING_OBJECTS, ft.Data());
}
else
{
@@ -126,7 +125,8 @@ private:
ft.Add<char*>(_downloadStatusInfo.Source.c_str());
ft.Add<int16_t>(static_cast<int16_t>(_downloadStatusInfo.Count));
ft.Add<int16_t>(static_cast<int16_t>(_downloadStatusInfo.Total));
format_string(str_downloading_objects, sizeof(str_downloading_objects), STR_DOWNLOADING_OBJECTS_FROM, args);
format_string(
str_downloading_objects, sizeof(str_downloading_objects), STR_DOWNLOADING_OBJECTS_FROM, ft.Data());
}
auto intent = Intent(WC_NETWORK_STATUS);