(svn r7227) -Fix: [YAPF] Bridge YAPF Penalty Incorrect. The penalty for upward slope was incorrectly applied on bridge exit. (Danny)
--- a/yapf/yapf_costbase.hpp Tue Nov 21 13:03:06 2006 +0000
+++ b/yapf/yapf_costbase.hpp Tue Nov 21 16:24:13 2006 +0000
@@ -8,10 +8,21 @@
FORCEINLINE static bool stSlopeCost(TileIndex tile, Trackdir td)
{
- if (IsDiagonalTrackdir(td) && !IsTunnelTile(tile)) {
- uint tile_slope = GetTileSlope(tile, NULL) & 0x0F;
- if ((c_upwards_slopes[tile_slope] & TrackdirToTrackdirBits(td)) != 0) {
+ 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;
+ 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;
+ } 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;