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

Tracerestrict: Handle slot acquire and wait at PBS on intermediary reservation signals

Browse Source 
Wait at PBS is applied as if on the starting signal
This commit is contained in:
Jonathan G Rennison
2024-01-20 20:42:13 +00:00
parent a21a69c957
commit 9e8a43144a
5 changed files with 136 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,15 +194,15 @@ struct CYapfRailNodeT
m_segment->m_last_td = td;
}
template <class Tbase, class Tfunc, class Tpf>
bool IterateTiles(const Train *v, Tpf &yapf, Tbase &obj, bool (Tfunc::*func)(TileIndex, Trackdir)) const
template <class Tbase, class Tpf, class Tfunc>
bool IterateTiles(const Train *v, Tpf &yapf, Tfunc func) const
{
typename Tbase::TrackFollower ft(v, yapf.GetCompatibleRailTypes());
TileIndex cur = base::GetTile();
Trackdir cur_td = base::GetTrackdir();
while (cur != GetLastTile() || cur_td != GetLastTrackdir()) {
if (!((obj.*func)(cur, cur_td))) return false;
if (!(func(cur, cur_td))) return false;
if (!ft.Follow(cur, cur_td)) break;
cur = ft.m_new_tile;
@@ -210,7 +210,15 @@ struct CYapfRailNodeT
cur_td = FindFirstTrackdir(ft.m_new_td_bits);
}
return (obj.*func)(cur, cur_td);
return func(cur, cur_td);
}
template <class Tbase, class Tpf, class Tfunc>
bool IterateTiles(const Train *v, Tpf &yapf, Tbase &obj, bool (Tfunc::*func)(TileIndex, Trackdir)) const
{
return this->template IterateTiles<Tbase>(v, yapf, [&](TileIndex tile, Trackdir td) -> bool {
return (obj.*func)(tile, td);
});
}
template <class Tbase, class Tpf>