gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 23:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r8867) -Fix(r8866): revert yapf_costrail.hpp commited by mistake, helpers.hpp had wrong line ending

Browse Source
This commit is contained in:
KUDr 2007-02-23 21:36:43 +00:00
parent f3d5fda36c
commit 9cdf6fdc7e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/yapf/yapf_costrail.hpp
View File

@ -66,7 +66,7 @@ public:
} }
/** return one tile cost. If tile is a tunnel entry, it is moved to the end of tunnel */ /** 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; int cost = 0;
// set base cost // set base cost
@ -81,7 +81,7 @@ public:
case MP_STATION: case MP_STATION:
// penalty for passing station tiles // penalty for passing station tiles
cost += Yapf().PfGetSettings().rail_station_penalty * DistanceManhattan(prev_tile, tile); cost += Yapf().PfGetSettings().rail_station_penalty;
break; break;
default: default:
@ -202,7 +202,7 @@ public:
bool target_seen = Yapf().PfDetectDestination(tile, trackdir); bool target_seen = Yapf().PfDetectDestination(tile, trackdir);
while (true) { 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().CurveCost(prev_trackdir, trackdir);
segment_cost += Yapf().SlopeCost(tile, trackdir); segment_cost += Yapf().SlopeCost(tile, trackdir);
segment_cost += Yapf().SignalCost(n, tile, trackdir); segment_cost += Yapf().SignalCost(n, tile, trackdir);