From 0c6e062d5ae915f488677379c51da8051342f983 Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Sun, 1 Dec 2019 09:15:07 +0000
Subject: [PATCH] Refactor return value of screen_coord_to_viewport_cord

---
 src/openrct2-ui/interface/ViewportInteraction.cpp | 2 +-
 src/openrct2/interface/Viewport.cpp               | 6 +++---
 src/openrct2/interface/Viewport.h                 | 2 +-
 src/openrct2/world/Footpath.cpp                   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp
index 2199af7cfc..82d42ce9df 100644
--- a/src/openrct2-ui/interface/ViewportInteraction.cpp
+++ b/src/openrct2-ui/interface/ViewportInteraction.cpp
@@ -680,7 +680,7 @@ CoordsXY sub_68A15E(ScreenCoordsXY screenCoords)
         waterHeight = tileElement->AsSurface()->GetWaterHeight() << 4;
     }
 
-    LocationXY16 initialVPPos = screen_coord_to_viewport_coord(viewport, screenCoords);
+    auto initialVPPos = screen_coord_to_viewport_coord(viewport, screenCoords);
     CoordsXY mapPos = initialPos + CoordsXY{ 16, 16 };
 
     for (int32_t i = 0; i < 5; i++)
diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp
index f7bbf965e8..4daf18d828 100644
--- a/src/openrct2/interface/Viewport.cpp
+++ b/src/openrct2/interface/Viewport.cpp
@@ -1042,9 +1042,9 @@ CoordsXY screen_pos_to_map_pos(ScreenCoordsXY screenCoords, int32_t* direction)
     return mapCoords->ToTileStart();
 }
 
-LocationXY16 screen_coord_to_viewport_coord(rct_viewport* viewport, ScreenCoordsXY screenCoords)
+ScreenCoordsXY screen_coord_to_viewport_coord(rct_viewport* viewport, ScreenCoordsXY screenCoords)
 {
-    LocationXY16 ret;
+    ScreenCoordsXY ret;
     ret.x = ((screenCoords.x - viewport->x) << viewport->zoom) + viewport->view_x;
     ret.y = ((screenCoords.y - viewport->y) << viewport->zoom) + viewport->view_y;
     return ret;
@@ -1763,7 +1763,7 @@ std::optional<CoordsXY> screen_get_map_xy(ScreenCoordsXY screenCoords, rct_viewp
         return std::nullopt;
     }
 
-    LocationXY16 start_vp_pos = screen_coord_to_viewport_coord(myViewport, screenCoords);
+    auto start_vp_pos = screen_coord_to_viewport_coord(myViewport, screenCoords);
     CoordsXY modifiedPos = { map_pos.x + 16, map_pos.y + 16 };
 
     for (int32_t i = 0; i < 5; i++)
diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h
index b75617e2a9..d5b08cbc38 100644
--- a/src/openrct2/interface/Viewport.h
+++ b/src/openrct2/interface/Viewport.h
@@ -140,7 +140,7 @@ void viewport_paint(
 
 CoordsXYZ viewport_adjust_for_map_height(const ScreenCoordsXY startCoords);
 
-LocationXY16 screen_coord_to_viewport_coord(rct_viewport* viewport, ScreenCoordsXY screenCoords);
+ScreenCoordsXY screen_coord_to_viewport_coord(rct_viewport* viewport, ScreenCoordsXY screenCoords);
 CoordsXY viewport_coord_to_map_coord(int32_t x, int32_t y, int32_t z);
 CoordsXY screen_pos_to_map_pos(ScreenCoordsXY screenCoords, int32_t* direction);
 
diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp
index c2107c5554..b3bec46b67 100644
--- a/src/openrct2/world/Footpath.cpp
+++ b/src/openrct2/world/Footpath.cpp
@@ -284,7 +284,7 @@ void footpath_get_coordinates_from_pos(
         }
     }
 
-    LocationXY16 start_vp_pos = screen_coord_to_viewport_coord(viewport, screenCoords);
+    auto start_vp_pos = screen_coord_to_viewport_coord(viewport, screenCoords);
 
     for (int32_t i = 0; i < 5; i++)
     {