From fe24e9b77bbafbfcd603baec1a34bd102643a53a Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Thu, 16 Oct 2025 20:44:13 +0200
Subject: [PATCH] Create Drawing.String.h

---
 .../engines/opengl/OpenGLDrawingEngine.cpp    |  1 +
 src/openrct2/drawing/Drawing.String.cpp       |  2 ++
 src/openrct2/drawing/Drawing.String.h         | 28 +++++++++++++++++++
 src/openrct2/drawing/Drawing.h                | 14 ----------
 src/openrct2/drawing/IDrawingContext.h        |  2 ++
 src/openrct2/drawing/X8DrawingEngine.cpp      |  1 +
 src/openrct2/drawing/X8DrawingEngine.h        |  2 ++
 src/openrct2/libopenrct2.vcxproj              |  1 +
 8 files changed, 37 insertions(+), 14 deletions(-)
 create mode 100644 src/openrct2/drawing/Drawing.String.h

diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
index 7fd40749ab..1ee9657c2c 100644
--- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
@@ -29,6 +29,7 @@
     #include <openrct2-ui/interface/Window.h>
     #include <openrct2/config/Config.h>
     #include <openrct2/core/Console.hpp>
+    #include <openrct2/drawing/Drawing.String.h>
     #include <openrct2/drawing/Drawing.h>
     #include <openrct2/drawing/IDrawingContext.h>
     #include <openrct2/drawing/IDrawingEngine.h>
diff --git a/src/openrct2/drawing/Drawing.String.cpp b/src/openrct2/drawing/Drawing.String.cpp
index 8afe554c95..e78f196106 100644
--- a/src/openrct2/drawing/Drawing.String.cpp
+++ b/src/openrct2/drawing/Drawing.String.cpp
@@ -7,6 +7,8 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../drawing/Drawing.String.h"
+
 #include "../Context.h"
 #include "../SpriteIds.h"
 #include "../config/Config.h"
diff --git a/src/openrct2/drawing/Drawing.String.h b/src/openrct2/drawing/Drawing.String.h
new file mode 100644
index 0000000000..41314dc53d
--- /dev/null
+++ b/src/openrct2/drawing/Drawing.String.h
@@ -0,0 +1,28 @@
+/*****************************************************************************
+ * Copyright (c) 2014-2025 OpenRCT2 developers
+ *
+ * For a complete list of all authors, please refer to contributors.md
+ * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
+ *
+ * OpenRCT2 is licensed under the GNU General Public License version 3.
+ *****************************************************************************/
+
+#pragma once
+
+#include <cstdint>
+
+enum class FontStyle : uint8_t;
+
+struct TextDrawInfo
+{
+    int32_t startX;
+    int32_t startY;
+    int32_t x;
+    int32_t y;
+    int32_t maxX;
+    int32_t maxY;
+    int32_t flags;
+    uint8_t palette[8];
+    FontStyle fontStyle;
+    const int8_t* yOffset;
+};
diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h
index d65cf87050..c74f614dff 100644
--- a/src/openrct2/drawing/Drawing.h
+++ b/src/openrct2/drawing/Drawing.h
@@ -113,20 +113,6 @@ struct RenderTarget
     }
 };
 
-struct TextDrawInfo
-{
-    int32_t startX;
-    int32_t startY;
-    int32_t x;
-    int32_t y;
-    int32_t maxX;
-    int32_t maxY;
-    int32_t flags;
-    uint8_t palette[8];
-    ::FontStyle fontStyle;
-    const int8_t* yOffset;
-};
-
 enum : uint32_t
 {
     TEXT_DRAW_FLAG_INSET = 1 << 0,
diff --git a/src/openrct2/drawing/IDrawingContext.h b/src/openrct2/drawing/IDrawingContext.h
index 4dd944fda5..5183296d4f 100644
--- a/src/openrct2/drawing/IDrawingContext.h
+++ b/src/openrct2/drawing/IDrawingContext.h
@@ -12,6 +12,8 @@
 #include "Drawing.h"
 #include "TTF.h"
 
+struct TextDrawInfo;
+
 namespace OpenRCT2::Drawing
 {
     struct IDrawingEngine;
diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp
index fc8731e7bb..5bd76ccc4c 100644
--- a/src/openrct2/drawing/X8DrawingEngine.cpp
+++ b/src/openrct2/drawing/X8DrawingEngine.cpp
@@ -18,6 +18,7 @@
 #include "../interface/Window.h"
 #include "../scenes/intro/IntroScene.h"
 #include "../ui/UiContext.h"
+#include "Drawing.String.h"
 #include "Drawing.h"
 #include "IDrawingContext.h"
 #include "IDrawingEngine.h"
diff --git a/src/openrct2/drawing/X8DrawingEngine.h b/src/openrct2/drawing/X8DrawingEngine.h
index 6ed83b1f1a..a0825c35f7 100644
--- a/src/openrct2/drawing/X8DrawingEngine.h
+++ b/src/openrct2/drawing/X8DrawingEngine.h
@@ -15,6 +15,8 @@
 
 #include <memory>
 
+struct TextDrawInfo;
+
 namespace OpenRCT2
 {
     namespace Ui
diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj
index d7a817f213..e679bb0616 100644
--- a/src/openrct2/libopenrct2.vcxproj
+++ b/src/openrct2/libopenrct2.vcxproj
@@ -244,6 +244,7 @@
     <ClInclude Include="Diagnostic.h" />
     <ClInclude Include="drawing\ColourPalette.h" />
     <ClInclude Include="drawing\Drawing.h" />
+    <ClInclude Include="drawing\Drawing.String.h" />
     <ClInclude Include="drawing\Font.h" />
     <ClInclude Include="drawing\IDrawingContext.h" />
     <ClInclude Include="drawing\IDrawingEngine.h" />