summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKUDr <kudr@openttd.org>2006-06-07 21:18:08 +0000
committerKUDr <kudr@openttd.org>2006-06-07 21:18:08 +0000
commit80a36fe5bd511fc669554f8acfc9c381743928e1 (patch)
treeb987fbd10a1640ef7a82db9fc4afd1a68a38a490
parent4c52f88ed1900f49f739160f6626b4004221698a (diff)
downloadopenttd-80a36fe5bd511fc669554f8acfc9c381743928e1.tar.xz
(svn r5163) - CodeChange: [YAPF] "treat first red two-way signal as dead end" is not applied if train didn't pass choice.
It allows pathfinder to plan route through first red two-way signal if the train has no other choice than to pass it.
-rw-r--r--yapf/yapf_costrail.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/yapf/yapf_costrail.hpp b/yapf/yapf_costrail.hpp
index ab708410d..b87793c60 100644
--- a/yapf/yapf_costrail.hpp
+++ b/yapf/yapf_costrail.hpp
@@ -106,7 +106,7 @@ public:
} else {
// we have a red signal in our direction
// was it first signal which is two-way?
- if (Yapf().TreatFirstRedTwoWaySignalAsEOL() && has_signal_against && n.m_num_signals_passed == 0) {
+ if (Yapf().TreatFirstRedTwoWaySignalAsEOL() && n.flags_u.flags_s.m_choice_seen && has_signal_against && n.m_num_signals_passed == 0) {
// yes, the first signal is two-way red signal => DEAD END
n.m_segment->flags_u.flags_s.m_end_of_line = true;
return -1;