mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 16:54:52 +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

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

@@ -196,7 +196,8 @@ static void window_server_list_mouseup(rct_window* w, rct_widgetindex widgetInde
}
else
{
set_format_arg(0, void*, server.version.c_str());
auto ft = Formatter::Common();
ft.Add<void*>(server.version.c_str());
context_show_error(STR_UNABLE_TO_CONNECT_TO_SERVER, STR_MULTIPLAYER_INCORRECT_SOFTWARE_VERSION);
}
}
@@ -234,7 +235,8 @@ static void window_server_list_dropdown(rct_window* w, rct_widgetindex widgetInd
}
else
{
set_format_arg(0, void*, server.version.c_str());
auto ft = Formatter::Common();
ft.Add<void*>(server.version.c_str());
context_show_error(STR_UNABLE_TO_CONNECT_TO_SERVER, STR_MULTIPLAYER_INCORRECT_SOFTWARE_VERSION);
}
break;
@@ -374,7 +376,8 @@ static void window_server_list_textinput(rct_window* w, rct_widgetindex widgetIn
static void window_server_list_invalidate(rct_window* w)
{
set_format_arg(0, char*, _version.c_str());
auto ft = Formatter::Common();
ft.Add<char*>(_version.c_str());
window_server_list_widgets[WIDX_BACKGROUND].right = w->width - 1;
window_server_list_widgets[WIDX_BACKGROUND].bottom = w->height - 1;
window_server_list_widgets[WIDX_TITLE].right = w->width - 2;