From b99c83246b4029f91579712ae9044fa9e1f6b2c9 Mon Sep 17 00:00:00 2001 From: frosch Date: Tue, 22 Jan 2008 16:08:17 +0000 Subject: (svn r11946) -Fix: slope detection of bridge ramps. YAPF failed for steep slopes. Trolly failed for a lot. --- src/yapf/yapf_costbase.hpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/yapf') diff --git a/src/yapf/yapf_costbase.hpp b/src/yapf/yapf_costbase.hpp index 2793aab9f..010c53ce1 100644 --- a/src/yapf/yapf_costbase.hpp +++ b/src/yapf/yapf_costbase.hpp @@ -13,11 +13,9 @@ struct CYapfCostBase { // it is bridge ramp, check if we are entering the bridge if (GetTunnelBridgeDirection(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; + Slope tile_slope = GetTileSlope(tile, NULL); + Axis axis = DiagDirToAxis(GetTunnelBridgeDirection(tile)); + return !HasBridgeFlatRamp(tile_slope, axis); } else { // not bridge ramp if (IsTunnelTile(tile)) return false; // tunnel entry/exit doesn't slope -- cgit v1.2.3-70-g09d2