Replace LocationXYZ32

src/openrct2/actions/GameAction.h

@@ -76,7 +76,7 @@ public:
     rct_string_id           ErrorTitle = STR_NONE;
     rct_string_id           ErrorMessage = STR_NONE;
     std::array<uint8, 12>   ErrorMessageArgs;
-    LocationXYZ32           Position = { 0 };
+    CoordsXYZ               Position = { 0 };
     money32                 Cost = 0;
     uint16                  ExpenditureType = 0;
 

src/openrct2/ride/TrackDesign.cpp

@@ -2225,7 +2225,7 @@ void track_design_draw_preview(rct_track_td6 * td6, uint8 * pixels)
     td6->cost        = cost;
     td6->track_flags = flags & 7;
 
-    LocationXYZ32 centre;
+    CoordsXYZ centre;
     centre.x = (gTrackPreviewMin.x + gTrackPreviewMax.x) / 2 + 16;
     centre.y = (gTrackPreviewMin.y + gTrackPreviewMax.y) / 2 + 16;
     centre.z = (gTrackPreviewMin.z + gTrackPreviewMax.z) / 2;

src/openrct2/world/Location.h

@@ -53,10 +53,6 @@ assert_struct_size(LocationXYZD16, 7);
 struct LocationXY32 {
     sint32 x, y;
 };
-
-struct LocationXYZ32 {
-    sint32 x, y, z;
-};
 #pragma pack(pop)
 
 /*

src/openrct2/world/Map.cpp

@@ -4049,7 +4049,7 @@ static void translate_3d_to_2d(sint32 rotation, sint32 *x, sint32 *y)
     *y = ry;
 }
 
-LocationXY32 translate_3d_to_2d_with_z(sint32 rotation, LocationXYZ32 pos)
+LocationXY32 translate_3d_to_2d_with_z(sint32 rotation, CoordsXYZ pos)
 {
     LocationXY32 result;
     switch (rotation & 3) {

src/openrct2/world/Map.h

@@ -567,7 +567,7 @@ bool map_large_scenery_get_origin(
 );
 
 void map_offset_with_rotation(sint16 *x, sint16 *y, sint16 offsetX, sint16 offsetY, uint8 rotation);
-LocationXY32 translate_3d_to_2d_with_z(sint32 rotation, LocationXYZ32 pos);
+LocationXY32 translate_3d_to_2d_with_z(sint32 rotation, CoordsXYZ pos);
 
 rct_tile_element *map_get_track_element_at(sint32 x, sint32 y, sint32 z);
 rct_tile_element *map_get_track_element_at_of_type(sint32 x, sint32 y, sint32 z, sint32 trackType);