1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00

Use TrackDesignGetZPlacement over place_virtual_track

This commit is contained in:
ζeh Matt
2021-10-28 23:51:28 +03:00
parent aa3f0abaa2
commit 4ab6a3721d
3 changed files with 8 additions and 3 deletions

View File

@@ -471,9 +471,7 @@ static int32_t window_track_place_get_base_z(const CoordsXY& loc)
if (surfaceElement->GetWaterHeight() > 0)
z = std::max(z, surfaceElement->GetWaterHeight());
return z
+ place_virtual_track(
_trackDesign.get(), PTD_OPERATION_GET_PLACE_Z, true, GetOrAllocateRide(PreviewRideId), { loc, z });
return z + TrackDesignGetZPlacement(_trackDesign.get(), GetOrAllocateRide(PreviewRideId), { loc, z });
}
/**

View File

@@ -1965,6 +1965,12 @@ money32 place_virtual_track(TrackDesign* td6, uint8_t ptdOperation, bool placeSc
return place_virtual_track(tds, td6, ptdOperation, placeScenery, ride, coords);
}
int32_t TrackDesignGetZPlacement(TrackDesign* td6, Ride* ride, const CoordsXYZ& coords)
{
TrackDesignState tds{};
return place_virtual_track(tds, td6, PTD_OPERATION_GET_PLACE_Z, true, ride, coords);
}
static money32 TrackDesignCreateRide(int32_t type, int32_t subType, int32_t flags, ride_id_t* outRideIndex)
{
// Don't set colours as will be set correctly later.

View File

@@ -225,6 +225,7 @@ extern ride_id_t gTrackDesignSaveRideIndex;
void TrackDesignMirror(TrackDesign* td6);
money32 place_virtual_track(TrackDesign* td6, uint8_t ptdOperation, bool placeScenery, Ride* ride, const CoordsXYZ& coords);
int32_t TrackDesignGetZPlacement(TrackDesign* td6, Ride* ride, const CoordsXYZ& coords);
///////////////////////////////////////////////////////////////////////////////
// Track design preview