From 59236443bab69bfb358055032fa6178aef835b7d Mon Sep 17 00:00:00 2001
From: Tulio Leao <tupaschoal@gmail.com>
Date: Wed, 8 Jul 2020 09:14:43 -0300
Subject: [PATCH] Make StaticLayout::Draw use ScreenCoordsXY

---
 src/openrct2/drawing/Text.cpp | 18 ++++++++----------
 src/openrct2/drawing/Text.h   |  3 ++-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp
index c7671c5fc7..85c726171f 100644
--- a/src/openrct2/drawing/Text.cpp
+++ b/src/openrct2/drawing/Text.cpp
@@ -31,7 +31,7 @@ StaticLayout::StaticLayout(utf8string source, TextPaint paint, int32_t width)
     LineHeight = font_get_line_height(fontSpriteBase);
 }
 
-void StaticLayout::Draw(rct_drawpixelinfo* dpi, int32_t x, int32_t y)
+void StaticLayout::Draw(rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords)
 {
     gCurrentFontFlags = 0;
     gCurrentFontSpriteBase = Paint.SpriteBase;
@@ -39,27 +39,25 @@ void StaticLayout::Draw(rct_drawpixelinfo* dpi, int32_t x, int32_t y)
     TextPaint tempPaint = Paint;
 
     gCurrentFontFlags = 0;
-    int32_t lineY = y;
-    int32_t lineX = x;
+    auto lineCoords = coords;
     switch (Paint.Alignment)
     {
         case TextAlignment::LEFT:
-            lineX = x;
             break;
         case TextAlignment::CENTRE:
-            lineX = x + MaxWidth / 2;
+            lineCoords.x += MaxWidth / 2;
             break;
         case TextAlignment::RIGHT:
-            lineX = x + MaxWidth;
+            lineCoords.x += MaxWidth;
             break;
     }
     utf8* buffer = Buffer;
     for (int32_t line = 0; line < LineCount; ++line)
     {
-        DrawText(dpi, { lineX, lineY }, &tempPaint, buffer);
+        DrawText(dpi, lineCoords, &tempPaint, buffer);
         tempPaint.Colour = TEXT_COLOUR_254;
         buffer = get_string_end(buffer) + 1;
-        lineY += LineHeight;
+        lineCoords.y += LineHeight;
     }
 }
 
@@ -227,7 +225,7 @@ int32_t gfx_draw_string_left_wrapped(
     _legacyPaint.SpriteBase = gCurrentFontSpriteBase;
 
     StaticLayout layout(buffer, _legacyPaint, width);
-    layout.Draw(dpi, coords.x, coords.y);
+    layout.Draw(dpi, coords);
 
     return layout.GetHeight();
 }
@@ -252,7 +250,7 @@ int32_t gfx_draw_string_centred_wrapped(
     int32_t lineHeight = layout.GetHeight() / lineCount;
     int32_t yOffset = (lineCount - 1) * lineHeight / 2;
 
-    layout.Draw(dpi, coords.x - layout.GetWidth() / 2, coords.y - yOffset);
+    layout.Draw(dpi, coords - ScreenCoordsXY{ layout.GetWidth() / 2, yOffset });
 
     return layout.GetHeight();
 }
diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h
index 818665baa7..773b840aa2 100644
--- a/src/openrct2/drawing/Text.h
+++ b/src/openrct2/drawing/Text.h
@@ -11,6 +11,7 @@
 
 #include "../common.h"
 
+struct ScreenCoordsXY;
 struct rct_drawpixelinfo;
 
 enum class TextAlignment
@@ -42,7 +43,7 @@ private:
 
 public:
     StaticLayout(utf8string source, TextPaint paint, int32_t width);
-    void Draw(rct_drawpixelinfo* dpi, int32_t x, int32_t y);
+    void Draw(rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords);
     int32_t GetHeight();
     int32_t GetWidth();
     int32_t GetLineCount();