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

Use BaseZ and ClearanceZ on ride_ratings_score_close_proximity_in_direction()

Browse Source
This commit is contained in:
Tulio Leao
2020-04-20 23:28:59 -03:00
parent 2479256bc1
commit a7c103261a
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2/ride/RideRatings.cpp
View File

@@ -454,8 +454,7 @@ static void ride_ratings_score_close_proximity_in_direction(TileElement* inputTi
}
break;
case TILE_ELEMENT_TYPE_PATH:
if (abs(static_cast<int32_t>(inputTileElement->base_height) - static_cast<int32_t>(tileElement->base_height))
<= 2)
if (abs(inputTileElement->GetBaseZ() - tileElement->GetBaseZ()) <= 2 * COORDS_Z_STEP)
{
proximity_score_increment(PROXIMITY_PATH_SIDE_CLOSE);
}
@@ -463,9 +462,7 @@ static void ride_ratings_score_close_proximity_in_direction(TileElement* inputTi
case TILE_ELEMENT_TYPE_TRACK:
if (inputTileElement->AsTrack()->GetRideIndex() != tileElement->AsTrack()->GetRideIndex())
{
if (abs(static_cast<int32_t>(inputTileElement->base_height)
- static_cast<int32_t>(tileElement->base_height))
<= 2)
if (abs(inputTileElement->GetBaseZ() - tileElement->GetBaseZ()) <= 2 * COORDS_Z_STEP)
{
proximity_score_increment(PROXIMITY_FOREIGN_TRACK_SIDE_CLOSE);
}
@@ -473,9 +470,9 @@ static void ride_ratings_score_close_proximity_in_direction(TileElement* inputTi
break;
case TILE_ELEMENT_TYPE_SMALL_SCENERY:
case TILE_ELEMENT_TYPE_LARGE_SCENERY:
if (tileElement->base_height < inputTileElement->clearance_height)
if (tileElement->GetBaseZ() < inputTileElement->GetClearanceZ())
{
if (inputTileElement->base_height > tileElement->clearance_height)
if (inputTileElement->GetBaseZ() > tileElement->GetClearanceZ())
{
proximity_score_increment(PROXIMITY_SCENERY_SIDE_ABOVE);
}