From 83b2be602f4afb0199dfdfcd3c3e45cf8d67a326 Mon Sep 17 00:00:00 2001
From: frutiemax <lucas.malo.belanger@gmail.com>
Date: Sun, 12 Dec 2021 12:33:09 -0500
Subject: [PATCH] Empty initialization for Formatter and TextPaint structures

---
 src/openrct2/drawing/Text.cpp      | 12 ++++++------
 src/openrct2/localisation/UTF8.cpp |  1 +
 src/openrct2/platform/Shared.cpp   |  2 ++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp
index 9ab2625ff1..63b530c18d 100644
--- a/src/openrct2/drawing/Text.cpp
+++ b/src/openrct2/drawing/Text.cpp
@@ -126,8 +126,8 @@ static void DrawText(
 
 void DrawTextBasic(rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format)
 {
-    Formatter ft;
-    TextPaint textPaint;
+    Formatter ft{};
+    TextPaint textPaint{};
     DrawTextBasic(dpi, coords, format, ft, textPaint);
 }
 
@@ -139,8 +139,8 @@ void DrawTextBasic(
 
 void DrawTextEllipsised(rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format)
 {
-    Formatter ft;
-    TextPaint textPaint;
+    Formatter ft{};
+    TextPaint textPaint{};
     DrawTextEllipsised(dpi, coords, width, format, ft, textPaint);
 }
 
@@ -168,8 +168,8 @@ void gfx_draw_string_no_formatting(
 
 int32_t DrawTextWrapped(rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format)
 {
-    Formatter ft;
-    TextPaint textPaint;
+    Formatter ft{};
+    TextPaint textPaint{};
     return DrawTextWrapped(dpi, coords, width, format, ft, textPaint);
 }
 
diff --git a/src/openrct2/localisation/UTF8.cpp b/src/openrct2/localisation/UTF8.cpp
index 2585764fa1..d9d8b8d5c6 100644
--- a/src/openrct2/localisation/UTF8.cpp
+++ b/src/openrct2/localisation/UTF8.cpp
@@ -9,6 +9,7 @@
 
 #include "Localisation.h"
 
+#include <cstring>
 #include <wchar.h>
 
 uint32_t utf8_get_next(const utf8* char_ptr, const utf8** nextchar_ptr)
diff --git a/src/openrct2/platform/Shared.cpp b/src/openrct2/platform/Shared.cpp
index c0244401e1..4a2ab65df6 100644
--- a/src/openrct2/platform/Shared.cpp
+++ b/src/openrct2/platform/Shared.cpp
@@ -29,6 +29,8 @@
 #include "Platform2.h"
 
 #include <algorithm>
+#include <array>
+#include <cstring>
 #include <stdlib.h>
 #include <time.h>