dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tracerestrict-sx' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-02-27 18:51:37 +00:00
parent c080a3c42c 87f583fd99
commit 8cf0f354d9
6 changed files with 237 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pathfinder/yapf/yapf_costrail.hpp
View File

@@ -192,9 +192,9 @@ private:
{
const Node *node = static_cast<const Node *>(node_ptr);
for (;;) {
TileIndex last_signal_tile = node->m_segment->m_last_signal_tile;
TileIndex last_signal_tile = node->m_last_non_reserve_through_signal_tile;
if (last_signal_tile != INVALID_TILE) {
Trackdir last_signal_trackdir = node->m_segment->m_last_signal_td;
Trackdir last_signal_trackdir = node->m_last_non_reserve_through_signal_td;
if (HasPbsSignalOnTrackdir(last_signal_tile, last_signal_trackdir)) {
return last_signal_tile;
} else {
@@ -348,14 +348,18 @@ public:
}
}
bool is_reserve_through = false;
if (ShouldCheckTraceRestrict(n, tile)) {
TraceRestrictProgramResult out;
bool is_reserve_through = false;
if (ExecuteTraceRestrict(n, tile, trackdir, cost, out, &is_reserve_through)) {
return -1;
}
if (is_reserve_through) n.m_num_signals_res_through_passed++;
}
if (!is_reserve_through) {
n.m_last_non_reserve_through_signal_tile = tile;
n.m_last_non_reserve_through_signal_td = trackdir;
}
n.m_num_signals_passed++;
n.m_segment->m_last_signal_tile = tile;