From 123d0cceb60e87737ac5e160de26276f2615a2e9 Mon Sep 17 00:00:00 2001
From: frutiemax <lucas.malo.belanger@gmail.com>
Date: Fri, 10 Jul 2020 21:06:23 -0400
Subject: [PATCH] Close #12173: Remove Formatter additions with void* (#12196)

---
 src/openrct2-ui/scripting/CustomWindow.cpp | 2 +-
 src/openrct2-ui/windows/ServerList.cpp     | 4 ++--
 src/openrct2/ride/Ride.cpp                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp
index b54ecc6188..9c279d537c 100644
--- a/src/openrct2-ui/scripting/CustomWindow.cpp
+++ b/src/openrct2-ui/scripting/CustomWindow.cpp
@@ -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;
diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp
index 98df233db7..95238c0f06 100644
--- a/src/openrct2-ui/windows/ServerList.cpp
+++ b/src/openrct2-ui/windows/ServerList.cpp
@@ -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;
diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index f8ff735cb0..95b88ecbb1 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -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
     {