dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r7227) -Fix: [YAPF] Bridge YAPF Penalty Incorrect. The penalty for upward slope was incorrectly applied on bridge exit. (Danny)

Browse Source
This commit is contained in:
KUDr
2006-11-21 16:24:13 +00:00
parent b8cf1f7504
commit 92a1daf4f5
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
yapf/yapf_costbase.hpp
View File

@@ -8,10 +8,21 @@ struct CYapfCostBase {
FORCEINLINE static bool stSlopeCost(TileIndex tile, Trackdir td) FORCEINLINE static bool stSlopeCost(TileIndex tile, Trackdir td)
{ {
if (IsDiagonalTrackdir(td) && !IsTunnelTile(tile)) { if (IsDiagonalTrackdir(td)) {
if (IsBridgeTile(tile) && IsBridgeRamp(tile)) {
// it is bridge ramp, check if we are entering the bridge
if (GetBridgeRampDirection(tile) != TrackdirToExitdir(td)) return false; // no, we are living it, no penalty
// we are entering the bridge
// if the tile slope is downwards, then bridge ramp has not upward slope
uint tile_slope = GetTileSlope(tile, NULL) & 0x0F; uint tile_slope = GetTileSlope(tile, NULL) & 0x0F;
if ((c_upwards_slopes[tile_slope] & TrackdirToTrackdirBits(td)) != 0) { if ((c_upwards_slopes[tile_slope] & TrackdirToTrackdirBits(ReverseTrackdir(td))) != 0) return false; // tile under ramp goes down, no penalty
// tile under ramp isn't going down, so ramp must go up
return true; return true;
} else {
// not bridge ramp
if (IsTunnelTile(tile)) return false; // tunnel entry/exit doesn't slope
uint tile_slope = GetTileSlope(tile, NULL) & 0x0F;
if ((c_upwards_slopes[tile_slope] & TrackdirToTrackdirBits(td)) != 0) return true; // slopes uphill => apply penalty
} }
} }
return false; return false;