Mercurial > hg > openttd
changeset 11530:bb3f530f9495 draft
(svn r15891) -Fix (r13464): YAPF used different penalties for aqueducts than for other water tiles.
| author | frosch <frosch@openttd.org> |
|---|---|
| date | Sun, 29 Mar 2009 18:20:02 +0000 |
| parents | 536d28b21537 |
| children | 23734bd05e51 |
| files | src/yapf/yapf_common.hpp src/yapf/yapf_ship.cpp |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/yapf/yapf_common.hpp +++ b/src/yapf/yapf_common.hpp @@ -160,7 +160,7 @@ int dy = abs(y1 - y2); int dmin = min(dx, dy); int dxy = abs(dx - dy); - int d = dmin * 7 + (dxy - 1) * (10 / 2); + int d = dmin * YAPF_TILE_CORNER_LENGTH + (dxy - 1) * (YAPF_TILE_LENGTH / 2); n.m_estimate = n.m_cost + d; assert(n.m_estimate >= n.m_parent->m_estimate); return true;
--- a/src/yapf/yapf_ship.cpp +++ b/src/yapf/yapf_ship.cpp @@ -113,11 +113,11 @@ FORCEINLINE bool PfCalcCost(Node& n, const TrackFollower *tf) { /* base tile cost depending on distance */ - int c = IsDiagonalTrackdir(n.GetTrackdir()) ? 10 : 7; + int c = IsDiagonalTrackdir(n.GetTrackdir()) ? YAPF_TILE_LENGTH : YAPF_TILE_CORNER_LENGTH; /* additional penalty for curves */ if (n.m_parent != NULL && n.GetTrackdir() != NextTrackdir(n.m_parent->GetTrackdir())) { /* new trackdir does not match the next one when going straight */ - c += 10; + c += YAPF_TILE_LENGTH; } c += YAPF_TILE_LENGTH * tf->m_tiles_skipped;