Mercurial > hg > openttd
changeset 14101:bc2511d7b627 draft
(svn r18648) -Fix/Feature [FS#3430-ish]: [YAPP] Treat the backside of an one-way path signals as a safe waiting point.
| author | michi_cc <michi_cc@openttd.org> |
|---|---|
| date | Sun, 27 Dec 2009 14:37:54 +0000 |
| parents | e4f2ba58a34f |
| children | c4f924c42ec1 |
| files | src/pbs.cpp |
| diffstat | 1 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/pbs.cpp +++ b/src/pbs.cpp @@ -369,8 +369,14 @@ if (ft.m_new_td_bits == TRACKDIR_BIT_NONE) return include_line_end; if (ft.m_new_td_bits != TRACKDIR_BIT_NONE && KillFirstBit(ft.m_new_td_bits) == TRACKDIR_BIT_NONE) { + Trackdir td = FindFirstTrackdir(ft.m_new_td_bits); /* PBS signal on next trackdir? Safe position. */ - if (HasPbsSignalOnTrackdir(ft.m_new_tile, FindFirstTrackdir(ft.m_new_td_bits))) return true; + if (HasPbsSignalOnTrackdir(ft.m_new_tile, td)) return true; + /* One-way PBS signal against us? Safe if end-of-line is allowed. */ + if (IsTileType(ft.m_new_tile, MP_RAILWAY) && HasSignalOnTrackdir(ft.m_new_tile, ReverseTrackdir(td)) && + GetSignalType(ft.m_new_tile, TrackdirToTrack(td)) == SIGTYPE_PBS_ONEWAY) { + return include_line_end; + } } return false;