diff options
Diffstat (limited to 'src/pathfinder')
| -rw-r--r-- | src/pathfinder/npf/npf.cpp | 4 | ||||
| -rw-r--r-- | src/pathfinder/yapf/yapf_costbase.hpp | 4 | ||||
| -rw-r--r-- | src/pathfinder/yapf/yapf_road.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/pathfinder/npf/npf.cpp b/src/pathfinder/npf/npf.cpp index 9eca606f0..bfefce215 100644 --- a/src/pathfinder/npf/npf.cpp +++ b/src/pathfinder/npf/npf.cpp @@ -237,8 +237,8 @@ static uint NPFSlopeCost(AyStarNode *current) /* Get the height on both sides of the tile edge. * Avoid testing the height on the tile-center. This will fail for halftile-foundations. */ - int z1 = GetSlopeZ(x1 + dx4, y1 + dy4); - int z2 = GetSlopeZ(x2 - dx4, y2 - dy4); + int z1 = GetSlopePixelZ(x1 + dx4, y1 + dy4); + int z2 = GetSlopePixelZ(x2 - dx4, y2 - dy4); if (z2 - z1 > 1) { /* Slope up */ diff --git a/src/pathfinder/yapf/yapf_costbase.hpp b/src/pathfinder/yapf/yapf_costbase.hpp index 057c0ae5b..6f6fed007 100644 --- a/src/pathfinder/yapf/yapf_costbase.hpp +++ b/src/pathfinder/yapf/yapf_costbase.hpp @@ -27,13 +27,13 @@ struct CYapfCostBase { /* it is bridge ramp, check if we are entering the bridge */ if (GetTunnelBridgeDirection(tile) != TrackdirToExitdir(td)) return false; // no, we are leaving it, no penalty /* we are entering the bridge */ - Slope tile_slope = GetTileSlope(tile, NULL); + Slope tile_slope = GetTilePixelSlope(tile, NULL); Axis axis = DiagDirToAxis(GetTunnelBridgeDirection(tile)); return !HasBridgeFlatRamp(tile_slope, axis); } else { /* not bridge ramp */ if (IsTunnelTile(tile)) return false; // tunnel entry/exit doesn't slope - Slope tile_slope = GetTileSlope(tile, NULL); + Slope tile_slope = GetTilePixelSlope(tile, NULL); return IsUphillTrackdir(tile_slope, td); // slopes uphill => apply penalty } } diff --git a/src/pathfinder/yapf/yapf_road.cpp b/src/pathfinder/yapf/yapf_road.cpp index c909e7e8a..9a0b40f5b 100644 --- a/src/pathfinder/yapf/yapf_road.cpp +++ b/src/pathfinder/yapf/yapf_road.cpp @@ -36,12 +36,12 @@ protected: /* height of the center of the current tile */ int x1 = TileX(tile) * TILE_SIZE; int y1 = TileY(tile) * TILE_SIZE; - int z1 = GetSlopeZ(x1 + TILE_SIZE / 2, y1 + TILE_SIZE / 2); + int z1 = GetSlopePixelZ(x1 + TILE_SIZE / 2, y1 + TILE_SIZE / 2); /* height of the center of the next tile */ int x2 = TileX(next_tile) * TILE_SIZE; int y2 = TileY(next_tile) * TILE_SIZE; - int z2 = GetSlopeZ(x2 + TILE_SIZE / 2, y2 + TILE_SIZE / 2); + int z2 = GetSlopePixelZ(x2 + TILE_SIZE / 2, y2 + TILE_SIZE / 2); if (z2 - z1 > 1) { /* Slope up */ |