Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r11967) -Fix (r1400): MP_ROAD can have railbits too - OPF searching over rail of diffent owner behind crossing

Browse Source
This commit is contained in:
smatz 2008-01-23 20:02:30 +00:00
parent e40944f8e0
commit b5641ae0f2
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pathfind.cpp
View File

@ -277,13 +277,6 @@ static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection directi
/* can we enter tile in this dir? */ /* can we enter tile in this dir? */
if (!CanAccessTileInDir(tile, ReverseDiagDir(direction), tpf->tracktype)) return; if (!CanAccessTileInDir(tile, ReverseDiagDir(direction), tpf->tracktype)) return;
/* Check in case of rail if the owner is the same */
if (tpf->tracktype == TRANSPORT_RAIL) {
if (IsTileType(tile_org, MP_RAILWAY) || IsTileType(tile_org, MP_STATION) || IsTileType(tile_org, MP_TUNNELBRIDGE))
if (IsTileType(tile, MP_RAILWAY) || IsTileType(tile, MP_STATION) || IsTileType(tile, MP_TUNNELBRIDGE))
if (GetTileOwner(tile_org) != GetTileOwner(tile)) return;
}
/* Check if the new tile is a tunnel or bridge head and that the direction /* Check if the new tile is a tunnel or bridge head and that the direction
* and transport type match */ * and transport type match */
if (IsTileType(tile, MP_TUNNELBRIDGE)) { if (IsTileType(tile, MP_TUNNELBRIDGE)) {
@ -293,9 +286,16 @@ static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection directi
} }
} }
tpf->rd.cur_length++; uint32 bits = GetTileTrackStatus(tile, tpf->tracktype, tpf->sub_type);
uint bits = GetTileTrackStatus(tile, tpf->tracktype, tpf->sub_type); /* Check in case of rail if the owner is the same */
if (tpf->tracktype == TRANSPORT_RAIL) {
if (bits != 0 && GetTileTrackStatus(tile_org, TRANSPORT_RAIL, 0) != 0) {
if (GetTileOwner(tile_org) != GetTileOwner(tile)) return;
}
}
tpf->rd.cur_length++;
if ((byte)bits != tpf->var2) { if ((byte)bits != tpf->var2) {
bits &= _tpfmode1_and[direction]; bits &= _tpfmode1_and[direction];