Replace LocationXY32

src/openrct2/ride/TrackDesign.cpp

@@ -2273,12 +2273,12 @@ void track_design_draw_preview(rct_track_td6 * td6, uint8 * pixels)
     dpi.pitch      = 0;
     dpi.bits       = pixels;
 
-    LocationXY32    offset = {size_x / 2, size_y / 2};
-    for (sint32 i      = 0; i < 4; i++)
+    CoordsXY offset = {size_x / 2, size_y / 2};
+    for (uint8 i = 0; i < 4; i++)
     {
         gCurrentRotation = i;
 
-        LocationXY32 pos2d = translate_3d_to_2d_with_z(i, centre);
+        CoordsXY pos2d = translate_3d_to_2d_with_z(i, centre);
         pos2d.x -= offset.x;
         pos2d.y -= offset.y;
 

src/openrct2/title/TitleSequencePlayer.cpp

@@ -55,7 +55,7 @@ private:
 
     sint32          _lastScreenWidth = 0;
     sint32          _lastScreenHeight = 0;
-    LocationXY32    _viewCentreLocation = { 0 };
+    CoordsXY        _viewCentreLocation = { 0 };
 
 public:
     explicit TitleSequencePlayer(IScenarioRepository * scenarioRepository)

src/openrct2/world/Location.h

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

src/openrct2/world/Map.cpp

@@ -4049,9 +4049,9 @@ static void translate_3d_to_2d(sint32 rotation, sint32 *x, sint32 *y)
     *y = ry;
 }
 
-LocationXY32 translate_3d_to_2d_with_z(sint32 rotation, CoordsXYZ pos)
+CoordsXY translate_3d_to_2d_with_z(sint32 rotation, CoordsXYZ pos)
 {
-    LocationXY32 result;
+    CoordsXY result = { 0 };
     switch (rotation & 3) {
     default:
     case 0:

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, CoordsXYZ pos);
+CoordsXY 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);

src/openrct2/world/MapGen.cpp

@@ -310,9 +310,9 @@ static void mapgen_place_trees()
         }
     }
 
-    LocationXY32 tmp, pos;
+    CoordsXY tmp, pos;
 
-    std::vector<LocationXY32> availablePositions;
+    std::vector<CoordsXY> availablePositions;
 
     // Create list of available tiles
     for (sint32 y = 1; y < gMapSize - 1; y++)