diff options
| author | peter1138 <peter1138@openttd.org> | 2006-05-23 20:02:52 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2006-05-23 20:02:52 +0000 |
| commit | a856831aec37b50307dae526ef81bd17e6879afd (patch) | |
| tree | cdfcbdf2d30a16f1ec0e2aedf45ce2af85e12d5a | |
| parent | 1ed3c5778b72fd144f2b668306a24ae8e808ab4b (diff) | |
| download | openttd-a856831aec37b50307dae526ef81bd17e6879afd.tar.xz | |
(svn r4964) - Fix NTP over bridges: don't check the rail type when on a bridge
| -rw-r--r-- | pathfind.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pathfind.c b/pathfind.c index fd27379ad..eff90d60a 100644 --- a/pathfind.c +++ b/pathfind.c @@ -734,9 +734,13 @@ start_at: // Check that the tile contains exactly one track if (bits == 0 || KILL_FIRST_BIT(bits) != 0) break; - if (IsTileType(tile, MP_STREET) ? !HASBIT(tpf->railtypes, GetRailTypeCrossing(tile)) : !HASBIT(tpf->railtypes, GetRailType(tile))) { - bits = 0; - break; + /* Check the rail type only if the train is *NOT* on top of + * a bridge. */ + if (!(IsBridgeTile(tile) && IsBridgeMiddle(tile) && GetBridgeAxis(tile) == DiagDirToAxis(direction))) { + if (IsTileType(tile, MP_STREET) ? !HASBIT(tpf->railtypes, GetRailTypeCrossing(tile)) : !HASBIT(tpf->railtypes, GetRailType(tile))) { + bits = 0; + break; + } } /////////////////// |