diff options
| author | KUDr <KUDr@openttd.org> | 2007-02-23 21:29:50 +0000 |
|---|---|---|
| committer | KUDr <KUDr@openttd.org> | 2007-02-23 21:29:50 +0000 |
| commit | 1c3d8fc1e3b1c6320122d528e50a50f01dac74cf (patch) | |
| tree | 81199111126750a854da1ff9ea5b29301dfc71f7 /src/yapf | |
| parent | a14de92f38c6f35129bec9c9194990125bbbdcef (diff) | |
| download | openttd-1c3d8fc1e3b1c6320122d528e50a50f01dac74cf.tar.xz | |
(svn r8866) -Doc: added more comments to template struct MakeEnumPropsT
Diffstat (limited to 'src/yapf')
| -rw-r--r-- | src/yapf/yapf_costrail.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/yapf/yapf_costrail.hpp b/src/yapf/yapf_costrail.hpp index b776815dc..ee40f77ad 100644 --- a/src/yapf/yapf_costrail.hpp +++ b/src/yapf/yapf_costrail.hpp @@ -66,7 +66,7 @@ public: } /** return one tile cost. If tile is a tunnel entry, it is moved to the end of tunnel */ - FORCEINLINE int OneTileCost(TileIndex& tile, Trackdir trackdir) + FORCEINLINE int OneTileCost(TileIndex prev_tile, TileIndex& tile, Trackdir trackdir) { int cost = 0; // set base cost @@ -81,7 +81,7 @@ public: case MP_STATION: // penalty for passing station tiles - cost += Yapf().PfGetSettings().rail_station_penalty; + cost += Yapf().PfGetSettings().rail_station_penalty * DistanceManhattan(prev_tile, tile); break; default: @@ -202,7 +202,7 @@ public: bool target_seen = Yapf().PfDetectDestination(tile, trackdir); while (true) { - segment_cost += Yapf().OneTileCost(tile, trackdir); + segment_cost += Yapf().OneTileCost(prev_tile, tile, trackdir); segment_cost += Yapf().CurveCost(prev_trackdir, trackdir); segment_cost += Yapf().SlopeCost(tile, trackdir); segment_cost += Yapf().SignalCost(n, tile, trackdir); |