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

Close #12173: Remove Formatter additions with void* (#12196)

Browse Source
This commit is contained in:
frutiemax
2020-07-10 21:06:23 -04:00
committed by GitHub
parent 3948600cd0
commit 123d0cceb6
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/scripting/CustomWindow.cpp
View File

@@ -660,7 +660,7 @@ namespace OpenRCT2::Ui::Windows
const auto& desc = GetInfo(w).Desc;
auto ft = Formatter::Common();
ft.Add<void*>(desc.Title.c_str());
ft.Add<const char*>(desc.Title.c_str());
auto& info = GetInfo(w);
size_t scrollIndex = 0;

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

@@ -197,7 +197,7 @@ static void window_server_list_mouseup(rct_window* w, rct_widgetindex widgetInde
else
{
auto ft = Formatter::Common();
ft.Add<void*>(server.Version.c_str());
ft.Add<const char*>(server.Version.c_str());
context_show_error(STR_UNABLE_TO_CONNECT_TO_SERVER, STR_MULTIPLAYER_INCORRECT_SOFTWARE_VERSION);
}
}
@@ -236,7 +236,7 @@ static void window_server_list_dropdown(rct_window* w, rct_widgetindex widgetInd
else
{
auto ft = Formatter::Common();
ft.Add<void*>(server.Version.c_str());
ft.Add<const char*>(server.Version.c_str());
context_show_error(STR_UNABLE_TO_CONNECT_TO_SERVER, STR_MULTIPLAYER_INCORRECT_SOFTWARE_VERSION);
}
break;

2
src/openrct2/ride/Ride.cpp
View File

@@ -7627,7 +7627,7 @@ void Ride::FormatNameTo(Formatter& ft) const
{
auto str = custom_name.c_str();
ft.Add<rct_string_id>(STR_STRING);
ft.Add<void*>(str);
ft.Add<const char*>(str);
}
else
{