diff options
author | frosch <frosch@openttd.org> | 2009-05-15 16:07:36 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2009-05-15 16:07:36 +0000 |
commit | 8ffb93c358c80fc24e349ad232648087508deec6 (patch) | |
tree | 05009b41503e46ed5e5a6edfa56f11dadafa66d9 /src/yapf | |
parent | 683a6ca039fb0c52093dd93261b6233dd6f482f3 (diff) | |
download | openttd-8ffb93c358c80fc24e349ad232648087508deec6.tar.xz |
(svn r16311) -Fix: (Get|Set)TrackBits() is only valid for RAIL_TILE_NORMAL and _SIGNALS.
Diffstat (limited to 'src/yapf')
-rw-r--r-- | src/yapf/yapf_costrail.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/yapf/yapf_costrail.hpp b/src/yapf/yapf_costrail.hpp index 81ef6a82a..a622d2671 100644 --- a/src/yapf/yapf_costrail.hpp +++ b/src/yapf/yapf_costrail.hpp @@ -111,7 +111,7 @@ public: FORCEINLINE int SwitchCost(TileIndex tile1, TileIndex tile2, DiagDirection exitdir) { - if (IsTileType(tile1, MP_RAILWAY) && IsTileType(tile2, MP_RAILWAY)) { + if (IsTileType(tile1, MP_RAILWAY) && IsTileType(tile2, MP_RAILWAY) && IsPlainRailTile(tile1) && IsPlainRailTile(tile2)) { bool t1 = KillFirstBit(GetTrackBits(tile1) & DiagdirReachesTracks(ReverseDiagDir(exitdir))) != TRACK_BIT_NONE; bool t2 = KillFirstBit(GetTrackBits(tile2) & DiagdirReachesTracks(exitdir)) != TRACK_BIT_NONE; if (t1 && t2) return Yapf().PfGetSettings().rail_doubleslip_penalty; |