petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r18535) -Fix [FS#2722]: don't account for path reservation costs when entering a signal block via a 'block' signal. This way you won't get double penalties, both red signals and reservation costs, for the block signalled tracks

Browse Source
This commit is contained in:
rubidium
2009-12-19 15:30:24 +00:00
parent f051ef01e3
commit c5159055e3
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pathfinder/yapf/yapf_node_rail.hpp
View File

@@ -206,6 +206,7 @@ struct CYapfRailNodeT
} flags_s;
} flags_u;
SignalType m_last_red_signal_type;
SignalType m_last_signal_type;
FORCEINLINE void Set(CYapfRailNodeT *parent, TileIndex tile, Trackdir td, bool is_choice)
{
@@ -215,10 +216,22 @@ struct CYapfRailNodeT
m_num_signals_passed = 0;
flags_u.m_inherited_flags = 0;
m_last_red_signal_type = SIGTYPE_NORMAL;
/* We use PBS as initial signal type because if we are in
* a PBS section and need to route, i.e. we're at a safe
* waiting point of a station, we need to account for the
* reservation costs. If we are in a normal block then we
* should be alone in there and as such the reservation
* costs should be 0 anyway. If there would be another
* train in the block, i.e. passing signals at danger
* then avoiding that train with help of the reservation
* costs is not a bad thing, actually it would probably
* be a good thing to do. */
m_last_signal_type = SIGTYPE_PBS;
} else {
m_num_signals_passed = parent->m_num_signals_passed;
flags_u.m_inherited_flags = parent->flags_u.m_inherited_flags;
m_last_red_signal_type = parent->m_last_red_signal_type;
m_last_signal_type = parent->m_last_signal_type;
}
flags_u.flags_s.m_choice_seen |= is_choice;
}