From f4ac2b4d5bbedc1dc564471e1365949630655ddf Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Fri, 16 Feb 2018 09:50:40 +0100
Subject: [PATCH] Replace LocationXYZD16

---
 src/openrct2/ride/Ride.cpp      | 2 +-
 src/openrct2/ride/Ride.h        | 2 +-
 src/openrct2/world/Entrance.cpp | 4 ++--
 src/openrct2/world/Entrance.h   | 7 +++----
 src/openrct2/world/Location.h   | 6 ------
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index 57aa6687c6..f839befcf1 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -193,7 +193,7 @@ uint8 _currentSeatRotationAngle;
 LocationXYZ16 _unkF44188;
 
 
-LocationXYZD16 _unkF440C5;
+CoordsXYZD _unkF440C5;
 
 uint8 gRideEntranceExitPlaceType;
 uint8 gRideEntranceExitPlaceRideIndex;
diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h
index ba51d29455..d2c9969a33 100644
--- a/src/openrct2/ride/Ride.h
+++ b/src/openrct2/ride/Ride.h
@@ -984,7 +984,7 @@ extern uint8 _currentSeatRotationAngle;
 
 extern LocationXYZ16 _unkF44188;
 
-extern LocationXYZD16 _unkF440C5;
+extern CoordsXYZD _unkF440C5;
 
 extern uint8 gRideEntranceExitPlaceType;
 extern uint8 gRideEntranceExitPlaceRideIndex;
diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp
index 99a5a52f64..838502feb7 100644
--- a/src/openrct2/world/Entrance.cpp
+++ b/src/openrct2/world/Entrance.cpp
@@ -30,9 +30,9 @@
 bool gParkEntranceGhostExists = false;
 LocationXYZ16 gParkEntranceGhostPosition = { 0, 0, 0 };
 uint8 gParkEntranceGhostDirection = 0;
-LocationXYZD16 gParkEntrances[MAX_PARK_ENTRANCES];
+CoordsXYZD gParkEntrances[MAX_PARK_ENTRANCES];
 
-LocationXYZD16 gRideEntranceExitGhostPosition;
+CoordsXYZD gRideEntranceExitGhostPosition;
 uint8 gRideEntranceExitGhostStationIndex;
 
 static void ParkEntranceRemoveSegment(sint32 x, sint32 y, sint32 z)
diff --git a/src/openrct2/world/Entrance.h b/src/openrct2/world/Entrance.h
index ae375f3abd..a7b2b8cff7 100644
--- a/src/openrct2/world/Entrance.h
+++ b/src/openrct2/world/Entrance.h
@@ -18,6 +18,7 @@
 #define _ENTRANCE_H_
 
 #include "../common.h"
+#include "Location.h"
 
 #pragma pack(push, 1)
 struct rct_entrance_type {
@@ -31,8 +32,6 @@ assert_struct_size(rct_entrance_type, 8);
 
 void game_command_remove_park_entrance(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp);
 
-struct LocationXYZ16;
-struct LocationXYZD16;
 struct rct_tile_element;
 
 extern bool gParkEntranceGhostExists;
@@ -41,9 +40,9 @@ extern uint8 gParkEntranceGhostDirection;
 
 #define MAX_PARK_ENTRANCES 4
 
-extern LocationXYZD16 gParkEntrances[MAX_PARK_ENTRANCES];
+extern CoordsXYZD gParkEntrances[MAX_PARK_ENTRANCES];
 
-extern LocationXYZD16 gRideEntranceExitGhostPosition;
+extern CoordsXYZD gRideEntranceExitGhostPosition;
 extern uint8 gRideEntranceExitGhostStationIndex;
 
 void park_entrance_remove_ghost();
diff --git a/src/openrct2/world/Location.h b/src/openrct2/world/Location.h
index 0403a45b42..680719e077 100644
--- a/src/openrct2/world/Location.h
+++ b/src/openrct2/world/Location.h
@@ -43,12 +43,6 @@ struct LocationXYZ16 {
     sint16 x, y, z;
 };
 assert_struct_size(LocationXYZ16, 6);
-
-struct LocationXYZD16 {
-    sint16 x, y, z;
-    uint8 direction;
-};
-assert_struct_size(LocationXYZD16, 7);
 #pragma pack(pop)
 
 /*