mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 15:24:30 +01:00
Code Issues Releases Wiki Activity

Clean up many other coordinates

Browse Source
This commit is contained in:
Gymnasiast
2020-03-13 12:03:43 +01:00
parent 3412c47a9e
commit bdf681f440
32 changed files with 132 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/ride/Vehicle.cpp
View File

@@ -4447,8 +4447,8 @@ static void vehicle_update_motion_boat_hire(Vehicle* vehicle)
}
else
{
if (ride->boat_hire_return_position.x != (flooredLocation.x / 32)
|| ride->boat_hire_return_position.y != (flooredLocation.y / 32))
auto flooredTileLoc = TileCoordsXY(flooredLocation);
if (ride->boat_hire_return_position != flooredTileLoc)
{
do_loc_6DAA97 = true;
}
@@ -9867,7 +9867,7 @@ void vehicle_update_crossings(const Vehicle* vehicle)
while (true)
{
auto* pathElement = map_get_path_element_at({ xyElement.x / 32, xyElement.y / 32, xyElement.element->base_height });
auto* pathElement = map_get_path_element_at(TileCoordsXYZ(CoordsXYZ{ xyElement, xyElement.element->GetBaseZ() }));
auto ride = get_ride(vehicle->ride);
// Many New Element parks have invisible rides hacked into the path.
@@ -9940,7 +9940,7 @@ void vehicle_update_crossings(const Vehicle* vehicle)
}
}
auto* pathElement = map_get_path_element_at({ xyElement.x / 32, xyElement.y / 32, xyElement.element->base_height });
auto* pathElement = map_get_path_element_at(TileCoordsXYZ(CoordsXYZ{ xyElement, xyElement.element->GetBaseZ() }));
if (pathElement)
{
pathElement->SetIsBlockedByVehicle(false);