From a0a9a7f3cd058bc87e5511d2e02a9e8bafec3bf5 Mon Sep 17 00:00:00 2001 From: matthijs Date: Tue, 26 Jun 2007 20:15:33 +0000 Subject: (svn r10345) -Fix [FS#290]: Make OPF handle coming out of a tunnel as well as going into a tunnel, to support road vehicles looking back when finding a depot while in a tunnel. -Fix [FS#290]: Make NPF look back when finding a depot for road vehicles. --- src/pathfind.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/pathfind.cpp') diff --git a/src/pathfind.cpp b/src/pathfind.cpp index 541fccb3c..60a3ac798 100644 --- a/src/pathfind.cpp +++ b/src/pathfind.cpp @@ -331,11 +331,19 @@ static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection directi if (IsTileType(tile, MP_TUNNELBRIDGE)) { if (IsTunnel(tile)) { - if (GetTunnelDirection(tile) != direction || - GetTunnelTransportType(tile) != tpf->tracktype) { + if (GetTunnelTransportType(tile) != tpf->tracktype) { + return; + } + /* Only skip through the tunnel if heading inwards. We can + * be headed outwards if our starting position was in a + * tunnel and we're pathfinding backwards */ + if (GetTunnelDirection(tile) == direction) { + tile = SkipToEndOfTunnel(tpf, tile, direction); + } if (GetTunnelDirection(tile) != ReverseDiagDir(direction)) { + /* We don't support moving through the sides of a tunnel + * entrance :-) */ return; } - tile = SkipToEndOfTunnel(tpf, tile, direction); } else { TileIndex tile_end; if (GetBridgeRampDirection(tile) != direction || -- cgit v1.2.3-54-g00ecf