(svn r14428) -Fix [FS#2306]: A 90-degree curve can be a safe waiting position if they are forbidden for trains.
--- a/src/pbs.cpp Tue Sep 30 21:18:28 2008 +0000
+++ b/src/pbs.cpp Wed Oct 01 15:48:44 2008 +0000
@@ -329,8 +329,8 @@
/* Check for reachable tracks. */
ft.m_new_td_bits &= DiagdirReachesTrackdirs(ft.m_exitdir);
+ if (forbid_90deg) ft.m_new_td_bits &= ~TrackdirCrossesTrackdirs(trackdir);
if (ft.m_new_td_bits == TRACKDIR_BIT_NONE) return include_line_end;
- if (forbid_90deg) ft.m_new_td_bits &= ~TrackdirCrossesTrackdirs(trackdir);
if (ft.m_new_td_bits != TRACKDIR_BIT_NONE && KillFirstBit(ft.m_new_td_bits) == TRACKDIR_BIT_NONE) {
/* PBS signal on next trackdir? Safe position. */
--- a/src/yapf/yapf_costrail.hpp Tue Sep 30 21:18:28 2008 +0000
+++ b/src/yapf/yapf_costrail.hpp Wed Oct 01 15:48:44 2008 +0000
@@ -437,8 +437,8 @@
end_segment_reason |= ESRB_DEAD_END;
}
- if (TrackFollower::DoTrackMasking() && tf_local.m_err != TrackFollower::EC_90DEG) {
- if (!HasOnewaySignalBlockingTrackdir(cur.tile, cur.td)) end_segment_reason |= ESRB_SAFE_TILE;
+ if (TrackFollower::DoTrackMasking() && !HasOnewaySignalBlockingTrackdir(cur.tile, cur.td)) {
+ end_segment_reason |= ESRB_SAFE_TILE;
}
break;
}
--- a/src/yapf/yapf_destrail.hpp Tue Sep 30 21:18:28 2008 +0000
+++ b/src/yapf/yapf_destrail.hpp Wed Oct 01 15:48:44 2008 +0000
@@ -85,8 +85,8 @@
FORCEINLINE bool PfDetectDestination(TileIndex tile, Trackdir td)
{
return
- IsSafeWaitingPosition(Yapf().GetVehicle(), tile, td, true, TrackFollower::Allow90degTurns()) &&
- IsWaitingPositionFree(Yapf().GetVehicle(), tile, td, TrackFollower::Allow90degTurns());
+ IsSafeWaitingPosition(Yapf().GetVehicle(), tile, td, true, !TrackFollower::Allow90degTurns()) &&
+ IsWaitingPositionFree(Yapf().GetVehicle(), tile, td, !TrackFollower::Allow90degTurns());
}
/** Called by YAPF to calculate cost estimate. Calculates distance to the destination