petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r2929) * Move DistanceTrack from map.c to npf.c and rename to NPFDistanceTrack.

Browse Source 
* Make NPFDistanceTrack return the distance multiplied by NPF_TILE_LENGTH to prevent rounding
  This should make ship and train pathfinding more accurate and faster.
* Update IsEndOfLine to prevent trains from trying to go off a slope onto a tunnel entrance.
This commit is contained in:
matthijs
2005-09-09 23:14:38 +00:00
parent a744b15907
commit cd54bf48d1
3 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
map.c
View File

@@ -155,21 +155,6 @@ uint DistanceMaxPlusManhattan(TileIndex t0, TileIndex t1)
return dx > dy ? 2 * dx + dy : 2 * dy + dx;
}
uint DistanceTrack(TileIndex t0, TileIndex t1)
{
const uint dx = abs(TileX(t0) - TileX(t1));
const uint dy = abs(TileY(t0) - TileY(t1));
const uint straightTracks = 2 * min(dx, dy); /* The number of straight (not full length) tracks */
/* OPTIMISATION:
* Original: diagTracks = max(dx, dy) - min(dx,dy);
* Proof:
* (dx-dy) - straightTracks == (min + max) - straightTracks = min + // max - 2 * min = max - min */
const uint diagTracks = dx + dy - straightTracks; /* The number of diagonal (full tile length) tracks. */
return diagTracks + straightTracks * STRAIGHT_TRACK_LENGTH;
}
uint DistanceFromEdge(TileIndex tile)
{
const uint xl = TileX(tile);