From fcfa4ffcc2021393bc01fec397dd899594175b6e Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Sat, 14 Oct 2017 23:53:45 +0200
Subject: [PATCH] Apply requested changes

---
 src/openrct2/drawing/Text.cpp | 4 ++--
 src/openrct2/drawing/Text.h   | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp
index b36b1a2d36..f54a63317c 100644
--- a/src/openrct2/drawing/Text.cpp
+++ b/src/openrct2/drawing/Text.cpp
@@ -214,7 +214,7 @@ extern "C"
         _legacyPaint.Alignment = TextAlignment::LEFT;
         _legacyPaint.SpriteBase = gCurrentFontSpriteBase;
 
-        auto layout = StaticLayout(buffer, _legacyPaint, width);
+        StaticLayout layout(buffer, _legacyPaint, width);
         layout.Draw(dpi, x, y);
 
         return layout.GetHeight();
@@ -232,7 +232,7 @@ extern "C"
         _legacyPaint.Alignment = TextAlignment::CENTRE;
         _legacyPaint.SpriteBase = gCurrentFontSpriteBase;
 
-        auto layout = StaticLayout(buffer, _legacyPaint, width);
+        StaticLayout layout(buffer, _legacyPaint, width);
 
         // The original tried to vertically centre the text, but used line count - 1
         sint32 lineCount = layout.GetLineCount();
diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h
index 3f7d891c61..c971c9ab0f 100644
--- a/src/openrct2/drawing/Text.h
+++ b/src/openrct2/drawing/Text.h
@@ -17,11 +17,7 @@
 #pragma once
 
 #include "../common.h"
-
-extern "C"
-{
-    #include "drawing.h"
-}
+#include "drawing.h"
 
 enum class TextAlignment
 {
@@ -47,6 +43,9 @@ private:
     sint32      _lineHeight;
     sint32      _maxWidth;
 
+    StaticLayout();
+    StaticLayout(const StaticLayout &);
+
 public:
     StaticLayout(utf8string source, TextPaint paint, sint32 width);
     void Draw(rct_drawpixelinfo * dpi, sint32 x, sint32 y);