Mercurial > hg > openttd
changeset 6130:226c021a4d40 draft
(svn r8867) -Fix(r8866): revert yapf_costrail.hpp commited by mistake, helpers.hpp had wrong line ending
author | KUDr <KUDr@openttd.org> |
---|---|
date | Fri, 23 Feb 2007 21:36:43 +0000 |
parents | 60867a3aff90 |
children | 518c876ed8ce |
files | src/helpers.hpp src/yapf/yapf_costrail.hpp |
diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/helpers.hpp +++ b/src/helpers.hpp @@ -81,10 +81,10 @@ /** Informative template class exposing basic enumeration properties used by several * other templates below. Here we have only forward declaration. For each enum type * we will create specialization derived from MakeEnumPropsT<>. - * i.e.: - * template <> struct EnumPropsT<Track> : MakeEnumPropsT<Track, byte, TRACK_BEGIN, TRACK_END, INVALID_TRACK> {}; - * followed by: - * typedef TinyEnumT<Track> TrackByte; + * i.e.: + * template <> struct EnumPropsT<Track> : MakeEnumPropsT<Track, byte, TRACK_BEGIN, TRACK_END, INVALID_TRACK> {}; + * followed by: + * typedef TinyEnumT<Track> TrackByte; */ template <typename Tenum_t> struct EnumPropsT;
--- a/src/yapf/yapf_costrail.hpp +++ b/src/yapf/yapf_costrail.hpp @@ -66,7 +66,7 @@ } /** return one tile cost. If tile is a tunnel entry, it is moved to the end of tunnel */ - FORCEINLINE int OneTileCost(TileIndex prev_tile, TileIndex& tile, Trackdir trackdir) + FORCEINLINE int OneTileCost(TileIndex& tile, Trackdir trackdir) { int cost = 0; // set base cost @@ -81,7 +81,7 @@ case MP_STATION: // penalty for passing station tiles - cost += Yapf().PfGetSettings().rail_station_penalty * DistanceManhattan(prev_tile, tile); + cost += Yapf().PfGetSettings().rail_station_penalty; break; default: @@ -202,7 +202,7 @@ bool target_seen = Yapf().PfDetectDestination(tile, trackdir); while (true) { - segment_cost += Yapf().OneTileCost(prev_tile, tile, trackdir); + segment_cost += Yapf().OneTileCost(tile, trackdir); segment_cost += Yapf().CurveCost(prev_trackdir, trackdir); segment_cost += Yapf().SlopeCost(tile, trackdir); segment_cost += Yapf().SignalCost(n, tile, trackdir);