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

Rename methods to GetBaseZ/GetClearanceZ

Browse Source
This commit is contained in:
Gymnasiast
2019-12-22 22:14:02 +01:00
parent 85ecb52e7c
commit 62fcbb07ca
61 changed files with 160 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/ride/TrackDesign.cpp
View File

@@ -181,7 +181,7 @@ rct_string_id TrackDesign::CreateTrackDesignTrack(const Ride& ride)
ride_get_start_of_track(&trackElement);
int32_t z = trackElement.element->GetBaseHeight();
int32_t z = trackElement.element->GetBaseZ();
uint8_t trackType = trackElement.element->AsTrack()->GetTrackType();
uint8_t direction = trackElement.element->GetDirection();
_saveDirection = direction;
@@ -237,7 +237,7 @@ rct_string_id TrackDesign::CreateTrackDesignTrack(const Ride& ride)
break;
}
z = trackElement.element->GetBaseHeight();
z = trackElement.element->GetBaseZ();
direction = trackElement.element->GetDirection();
trackType = trackElement.element->AsTrack()->GetTrackType();
@@ -350,7 +350,7 @@ rct_string_id TrackDesign::CreateTrackDesignMaze(const Ride& ride)
return STR_TRACK_TOO_LARGE_OR_TOO_MUCH_SCENERY;
}
gTrackPreviewOrigin = { startLoc.x, startLoc.y, startLoc.element->GetBaseHeight() };
gTrackPreviewOrigin = { startLoc.x, startLoc.y, startLoc.element->GetBaseZ() };
// x is defined here as we can start the search
// on tile start_x, start_y but then the next row
@@ -1432,7 +1432,7 @@ static int32_t track_design_place_maze(TrackDesign* td6, int16_t x, int16_t y, i
auto surfaceElement = map_get_surface_element_at(mapCoord);
if (surfaceElement == nullptr)
continue;
int16_t map_height = surfaceElement->GetBaseHeight();
int16_t map_height = surfaceElement->GetBaseZ();
if (surfaceElement->GetSlope() & TILE_ELEMENT_SLOPE_ALL_CORNERS_UP)
{
map_height += 16;
@@ -1602,7 +1602,7 @@ static bool track_design_place_ride(TrackDesign* td6, int16_t x, int16_t y, int1
return false;
}
int32_t height = surfaceElement->GetBaseHeight();
int32_t height = surfaceElement->GetBaseZ();
if (surfaceElement->GetSlope() & TILE_ELEMENT_SLOPE_ALL_CORNERS_UP)
{
height += 16;