1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 01:04:50 +01:00

Replace mapElement with tileElement

This commit is contained in:
Michael Steenbeek
2017-10-31 14:03:45 +01:00
parent ce8d9cc71b
commit af845beb61
143 changed files with 9245 additions and 9245 deletions

View File

@@ -406,24 +406,24 @@ static void window_track_place_clear_provisional()
*/
static sint32 window_track_place_get_base_z(sint32 x, sint32 y)
{
rct_tile_element *mapElement;
rct_tile_element *tileElement;
sint32 z;
mapElement = map_get_surface_element_at(x >> 5, y >> 5);
z = mapElement->base_height * 8;
tileElement = map_get_surface_element_at(x >> 5, y >> 5);
z = tileElement->base_height * 8;
// Increase Z above slope
if (mapElement->properties.surface.slope & 0x0F) {
if (tileElement->properties.surface.slope & 0x0F) {
z += 16;
// Increase Z above double slope
if (mapElement->properties.surface.slope & 0x10)
if (tileElement->properties.surface.slope & 0x10)
z += 16;
}
// Increase Z above water
if (map_get_water_height(mapElement) > 0)
z = Math::Max(z, map_get_water_height(mapElement) << 4);
if (map_get_water_height(tileElement) > 0)
z = Math::Max(z, map_get_water_height(tileElement) << 4);
return z + place_virtual_track(_trackDesign, PTD_OPERATION_GET_PLACE_Z, true, 0, x, y, z);
}