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

Change all calls to DrawTextBasic to use Formatter

Browse Source
This commit is contained in:
Gymnasiast
2021-07-27 20:32:27 +02:00
parent c97e8d36f1
commit 676ef7205e
32 changed files with 558 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -431,21 +431,27 @@ static void window_multiplayer_information_paint(rct_window* w, rct_drawpixelinf
const utf8* providerName = network_get_server_provider_name();
if (!str_is_null_or_empty(providerName))
{
DrawTextBasic(dpi, screenCoords, STR_PROVIDER_NAME, static_cast<void*>(&providerName));
auto ft = Formatter();
ft.Add<const char*>(providerName);
DrawTextBasic(dpi, screenCoords, STR_PROVIDER_NAME, ft);
screenCoords.y += LIST_ROW_HEIGHT;
}
const utf8* providerEmail = network_get_server_provider_email();
if (!str_is_null_or_empty(providerEmail))
{
DrawTextBasic(dpi, screenCoords, STR_PROVIDER_EMAIL, static_cast<void*>(&providerEmail));
auto ft = Formatter();
ft.Add<const char*>(providerEmail);
DrawTextBasic(dpi, screenCoords, STR_PROVIDER_EMAIL, ft);
screenCoords.y += LIST_ROW_HEIGHT;
}
const utf8* providerWebsite = network_get_server_provider_website();
if (!str_is_null_or_empty(providerWebsite))
{
DrawTextBasic(dpi, screenCoords, STR_PROVIDER_WEBSITE, static_cast<void*>(&providerWebsite));
auto ft = Formatter();
ft.Add<const char*>(providerWebsite);
DrawTextBasic(dpi, screenCoords, STR_PROVIDER_WEBSITE, ft);
}
}
}
@@ -558,7 +564,9 @@ static void window_multiplayer_players_paint(rct_window* w, rct_drawpixelinfo* d
// Number of players
stringId = w->no_list_items == 1 ? STR_MULTIPLAYER_PLAYER_COUNT : STR_MULTIPLAYER_PLAYER_COUNT_PLURAL;
auto screenCoords = w->windowPos + ScreenCoordsXY{ 4, w->widgets[WIDX_LIST].bottom + 2 };
DrawTextBasic(dpi, screenCoords, stringId, &w->no_list_items, { w->colours[2] });
auto ft = Formatter();
ft.Add<uint16_t>(w->no_list_items);
DrawTextBasic(dpi, screenCoords, stringId, ft, { w->colours[2] });
}
static void window_multiplayer_players_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex)