Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r7164) -Fix: [YAPF] assert when look-ahead polynomial result (red-signal penalty) is negative. Such penalty is now added as positive penalty for the appropriate green signal. (DannyA)

Browse Source
This commit is contained in:
KUDr 2006-11-16 10:51:42 +00:00
parent a15768953b
commit 3a90d6d00c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yapf/yapf_costrail.hpp
View File

@ -100,9 +100,16 @@ public:
n.m_segment->flags_u.flags_s.m_end_of_line = true;
} else if (has_signal_along) {
SignalState sig_state = GetSignalStateByTrackdir(tile, trackdir);
// cache the look-ahead polynomial constant only if we didn't pass more signals than the look-ahead limit is
int look_ahead_cost = (n.m_num_signals_passed < m_sig_look_ahead_costs.Size()) ? m_sig_look_ahead_costs.Data()[n.m_num_signals_passed] : 0;
if (sig_state != SIGNAL_STATE_RED) {
// green signal
n.flags_u.flags_s.m_last_signal_was_red = false;
// negative look-ahead red-signal penalties would cause problems later, so use them as positive penalties for green signal
if (look_ahead_cost < 0) {
// add its negation to the cost
cost -= look_ahead_cost;
}
} else {
// we have a red signal in our direction
// was it first signal which is two-way?
@ -116,8 +123,9 @@ public:
n.flags_u.flags_s.m_last_signal_was_red = true;
// look-ahead signal penalty
if (n.m_num_signals_passed < m_sig_look_ahead_costs.Size()) {
cost += m_sig_look_ahead_costs.Data()[n.m_num_signals_passed];
if (look_ahead_cost > 0) {
// add the look ahead penalty only if it is positive
cost += look_ahead_cost;
}
// special signal penalties