mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r149) -Fix: [997703] Junction after tunnel bug (blathijs)

This commit is contained in:
truelight 2004-09-03 16:03:17 +00:00
parent 3b96ad994c
commit b5a0840621
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pathfind.c
View File

@ -594,11 +594,17 @@ void NTPEnum(NewTrackPathFinder *tpf, uint tile, uint direction)
restart:
if (IS_TILETYPE(tile, MP_TUNNELBRIDGE) && (_map5[tile] & 0xF0)==0) {
if ( (uint)(_map5[tile] & 3) != direction || ((_map5[tile]>>1)&6) != tpf->tracktype)
/* This is a tunnel tile */
if ( (uint)(_map5[tile] & 3) != (direction ^ 2)) { /* ^ 2 is reversing the direction */
/* We are not just driving out of the tunnel */
if ( (uint)(_map5[tile] & 3) != direction || ((_map5[tile]>>1)&6) != tpf->tracktype)
/* We are not driving into the tunnel, or it
* is an invalid tunnel */
goto popnext;
flotr = FindLengthOfTunnel(tile, direction, tpf->tracktype);
si.cur_length += flotr.length;
tile = flotr.tile;
flotr = FindLengthOfTunnel(tile, direction, tpf->tracktype);
si.cur_length += flotr.length;
tile = flotr.tile;
}
}
// remember the start tile so we know if we're in an inf loop.