# HG changeset patch # User matthijs # Date 2005-06-22 01:06:04 # Node ID 719ba8934486e5b5f6b8607ded726c0c75668250 # Parent 03af03d7b95905ff5648314a706d135705ecb284 (svn r2471) - Fix: [ 1221249 ] [NPF] Vehicles try to drive into a tunnel entrance from above. diff --git a/npf.c b/npf.c --- a/npf.c +++ b/npf.c @@ -461,6 +461,12 @@ void NPFFollowTrack(AyStar* aystar, Open } } + /* I can't enter a tunnel entry/exit tile from a tile above the tunnel. Note + * that I can enter the tunnel from a tile below the tunnel entrance. This + * solves the problem of vehicles wanting to drive off a tunnel entrance */ + if (IsTileType(dst_tile, MP_TUNNELBRIDGE) && (_map5[dst_tile] & 0xF0) == 0 && GetTileZ(dst_tile) < GetTileZ(src_tile)) + return; + /* check correct rail type (mono, maglev, etc) * XXX: This now compares with the previous tile, which should not pose a * problem, but it might be nicer to compare with the first tile, or even