From e811c6a8681a9bb65793a9895dc8a5f4b1d4b755 Mon Sep 17 00:00:00 2001 From: KUDr Date: Wed, 7 Jun 2006 21:18:08 +0000 Subject: [PATCH] (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. --- yapf/yapf_costrail.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yapf/yapf_costrail.hpp b/yapf/yapf_costrail.hpp index ab708410de..b87793c60f 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;