mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r7623) - Fix: [YAPF] trains/roadvehs trying to enter the bridge ramp from under bridge rail/road (introduced by bridge merge r7573)

release/0.6
KUDr 2006-12-29 18:40:02 +00:00
parent 55e785d038
commit 62f55edbe7
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
yapf/follow_track.hpp
View File

@ -178,11 +178,19 @@ protected:
}
}
// tunnel tiles can be entered only from proper direction
if (!IsWaterTT() && !m_is_tunnel && IsTunnelTile(m_new_tile)) {
DiagDirection tunnel_enterdir = GetTunnelDirection(m_new_tile);
if (tunnel_enterdir != m_exitdir)
return false;
// tunnel holes and bridge ramps can be entered only from proper direction
if (!IsWaterTT() && IsTileType(m_new_tile, MP_TUNNELBRIDGE)) {
if (IsTunnel(m_new_tile)) {
if (!m_is_tunnel) {
DiagDirection tunnel_enterdir = GetTunnelDirection(m_new_tile);
if (tunnel_enterdir != m_exitdir) return false;
}
} else if (IsBridge(m_new_tile)) {
if (!m_is_bridge) {
DiagDirection ramp_enderdir = GetBridgeRampDirection(m_new_tile);
if (ramp_enderdir != m_exitdir) return false;
}
}
}
// special handling for rail stations - get to the end of platform