diff options
| author | rubidium <rubidium@openttd.org> | 2008-08-11 22:58:30 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-08-11 22:58:30 +0000 |
| commit | 467d6e31c3df981615636094b2cfd324234a61b6 (patch) | |
| tree | 5e6fcd0851755e13adfbdb92a616440c26c4e51f /src/yapf/yapf_costrail.hpp | |
| parent | 31d69a49e87e1388c4cfdbccb7d256572283d308 (diff) | |
| download | openttd-467d6e31c3df981615636094b2cfd324234a61b6.tar.xz | |
(svn r14048) -Fix (r14019) [FS#2222]: Redo the check for reserved tracks properly this time. (michi_cc)
Diffstat (limited to 'src/yapf/yapf_costrail.hpp')
| -rw-r--r-- | src/yapf/yapf_costrail.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/yapf/yapf_costrail.hpp b/src/yapf/yapf_costrail.hpp index edcb7c7e8..8259f4bb9 100644 --- a/src/yapf/yapf_costrail.hpp +++ b/src/yapf/yapf_costrail.hpp @@ -399,7 +399,7 @@ no_entry_cost: // jump here at the beginning if the node has no parent (it is th } else if (cur.tile_type == MP_RAILWAY && IsRailWaypoint(cur.tile)) { /* Waypoint is also a good reason to finish. */ end_segment_reason |= ESRB_WAYPOINT; - } else if (TrackFollower::MaskReservedTracks() && cur.tile_type == MP_RAILWAY) { + } else if (TrackFollower::DoTrackMasking() && cur.tile_type == MP_RAILWAY) { /* Searching for a safe tile? */ if (HasSignalOnTrackdir(cur.tile, cur.td) && !IsPbsSignal(GetSignalType(cur.tile, TrackdirToTrack(cur.td)))) { end_segment_reason |= ESRB_SAFE_TILE; @@ -437,7 +437,7 @@ no_entry_cost: // jump here at the beginning if the node has no parent (it is th end_segment_reason |= ESRB_DEAD_END; } - if (TrackFollower::MaskReservedTracks() && tf_local.m_err != TrackFollower::EC_90DEG) { + if (TrackFollower::DoTrackMasking() && tf_local.m_err != TrackFollower::EC_90DEG) { if (!HasOnewaySignalBlockingTrackdir(cur.tile, cur.td)) end_segment_reason |= ESRB_SAFE_TILE; } break; @@ -453,7 +453,7 @@ no_entry_cost: // jump here at the beginning if the node has no parent (it is th /* Gather the next tile/trackdir/tile_type/rail_type. */ TILE next(tf_local.m_new_tile, (Trackdir)FindFirstBit2x64(tf_local.m_new_td_bits)); - if (TrackFollower::MaskReservedTracks() && HasPbsSignalOnTrackdir(next.tile, next.td)) { + if (TrackFollower::DoTrackMasking() && HasPbsSignalOnTrackdir(next.tile, next.td)) { /* Possible safe tile. */ end_segment_reason |= ESRB_SAFE_TILE; } |