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

Reverse behind signal pathfinding now takes into account train length

Browse Source 
This is to avoid pathfinding into a reversing track section which
is too short
This commit is contained in:
Jonathan G Rennison
2021-09-11 14:53:08 +01:00
parent 29df09e917
commit 7018babeac
4 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,6 +215,35 @@ struct CYapfRailNodeT
return (obj.*func)(cur, cur_td);
}
template <class Tbase, class Tpf>
uint GetNodeLength(const Train *v, Tpf &yapf, Tbase &obj) const
{
typename Tbase::TrackFollower ft(v, yapf.GetCompatibleRailTypes());
TileIndex cur = base::GetTile();
Trackdir cur_td = base::GetTrackdir();
uint length = 0;
while (cur != GetLastTile() || cur_td != GetLastTrackdir()) {
length += IsDiagonalTrackdir(cur_td) ? TILE_SIZE : (TILE_SIZE / 2);
if (!ft.Follow(cur, cur_td)) break;
length += TILE_SIZE * ft.m_tiles_skipped;
cur = ft.m_new_tile;
assert(KillFirstBit(ft.m_new_td_bits) == TRACKDIR_BIT_NONE);
cur_td = FindFirstTrackdir(ft.m_new_td_bits);
}
EndSegmentReasonBits esrb = this->m_segment->m_end_segment_reason;
if (!(esrb & ESRB_DEAD_END) || (esrb & ESRB_DEAD_END_EOL)) {
length += IsDiagonalTrackdir(cur_td) ? TILE_SIZE : (TILE_SIZE / 2);
if (IsTileType(cur, MP_TUNNELBRIDGE) && IsTunnelBridgeSignalSimulationEntrance(cur) && TrackdirEntersTunnelBridge(cur, cur_td)) {
length += TILE_SIZE * GetTunnelBridgeLength(cur, GetOtherTunnelBridgeEnd(cur));
}
}
return length;
}
void Dump(DumpTarget &dmp) const
{
base::Dump(dmp);