From 9cdf6fdc7e9b5290866074deb828dc2ec2e183a5 Mon Sep 17 00:00:00 2001 From: KUDr Date: Fri, 23 Feb 2007 21:36:43 +0000 Subject: (svn r8867) -Fix(r8866): revert yapf_costrail.hpp commited by mistake, helpers.hpp had wrong line ending --- src/helpers.hpp | 8 ++++---- src/yapf/yapf_costrail.hpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/helpers.hpp b/src/helpers.hpp index 3682033e9..d0071ae0b 100644 --- a/src/helpers.hpp +++ b/src/helpers.hpp @@ -81,10 +81,10 @@ template static inline T delta(T a, T b) { return a < b ? b - a : a /** 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 : MakeEnumPropsT {}; - * followed by: - * typedef TinyEnumT TrackByte; + * i.e.: + * template <> struct EnumPropsT : MakeEnumPropsT {}; + * followed by: + * typedef TinyEnumT TrackByte; */ template struct EnumPropsT; diff --git a/src/yapf/yapf_costrail.hpp b/src/yapf/yapf_costrail.hpp index ee40f77ad..b776815dc 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 prev_tile, TileIndex& tile, Trackdir trackdir) + FORCEINLINE int OneTileCost(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 * DistanceManhattan(prev_tile, tile); + cost += Yapf().PfGetSettings().rail_station_penalty; break; default: @@ -202,7 +202,7 @@ public: 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); -- cgit v1.2.3-70-g09d2