diff options
author | tron <tron@openttd.org> | 2005-01-31 07:23:15 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2005-01-31 07:23:15 +0000 |
commit | 7bbcf5875c2fc6a8fa80e417d65e1094947d78b8 (patch) | |
tree | c97da17a330889a788b8654dddbc7507d01b3b38 /ai_pathfinder.c | |
parent | e1c19367f0cebbe90596319e9f82d959fa54621c (diff) | |
download | openttd-7bbcf5875c2fc6a8fa80e417d65e1094947d78b8.tar.xz |
(svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names
Diffstat (limited to 'ai_pathfinder.c')
-rw-r--r-- | ai_pathfinder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ai_pathfinder.c b/ai_pathfinder.c index 4510c60f4..6266352dd 100644 --- a/ai_pathfinder.c +++ b/ai_pathfinder.c @@ -153,12 +153,12 @@ static int32 AyStar_AiPathFinder_CalculateH(AyStar *aystar, AyStarNode *current, int r, r2; if (PathFinderInfo->end_direction != AI_PATHFINDER_NO_DIRECTION) { // The station is pointing to a direction, add a tile towards that direction, so the H-value is more accurate - r = GetTileDist(current->tile, PathFinderInfo->end_tile_tl + TileOffsByDir(PathFinderInfo->end_direction)); - r2 = GetTileDist(current->tile, PathFinderInfo->end_tile_br + TileOffsByDir(PathFinderInfo->end_direction)); + r = DistanceManhattan(current->tile, PathFinderInfo->end_tile_tl + TileOffsByDir(PathFinderInfo->end_direction)); + r2 = DistanceManhattan(current->tile, PathFinderInfo->end_tile_br + TileOffsByDir(PathFinderInfo->end_direction)); } else { // No direction, so just get the fastest route to the station - r = GetTileDist(current->tile, PathFinderInfo->end_tile_tl); - r2 = GetTileDist(current->tile, PathFinderInfo->end_tile_br); + r = DistanceManhattan(current->tile, PathFinderInfo->end_tile_tl); + r2 = DistanceManhattan(current->tile, PathFinderInfo->end_tile_br); } // See if the bottomright is faster than the topleft.. if (r2 < r) r = r2; |