diff options
| author | smatz <smatz@openttd.org> | 2007-12-16 19:30:42 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2007-12-16 19:30:42 +0000 |
| commit | 145517fb8e0bbd66daa711ca2b31aecc0179fe74 (patch) | |
| tree | 3d93af5bbe577ea3e66b1184cb89c1a934d6bcda /src/elrail.cpp | |
| parent | 0730b9afc135eabce02144e2928b86cfa0b7f95e (diff) | |
| download | openttd-145517fb8e0bbd66daa711ca2b31aecc0179fe74.tar.xz | |
(svn r11649) -Codechange: some code can be simplified thanks to changes in r11642
Diffstat (limited to 'src/elrail.cpp')
| -rw-r--r-- | src/elrail.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/elrail.cpp b/src/elrail.cpp index fd6e47fec..1aedb056a 100644 --- a/src/elrail.cpp +++ b/src/elrail.cpp @@ -93,17 +93,11 @@ static TrackBits GetRailTrackBitsUniversal(TileIndex t, byte *override) break; case MP_TUNNELBRIDGE: - if (IsTunnel(t)) { - if (GetRailType(t) != RAILTYPE_ELECTRIC) return TRACK_BIT_NONE; - if (override != NULL) *override = 1 << GetTunnelBridgeDirection(t); - return AxisToTrackBits(DiagDirToAxis(GetTunnelBridgeDirection(t))); - } else { - if (GetRailType(t) != RAILTYPE_ELECTRIC) return TRACK_BIT_NONE; - if (override != NULL && DistanceMax(t, GetOtherBridgeEnd(t)) > 1) { - *override = 1 << GetTunnelBridgeDirection(t); - } - return AxisToTrackBits(DiagDirToAxis(GetTunnelBridgeDirection(t))); + if (GetRailType(t) != RAILTYPE_ELECTRIC) return TRACK_BIT_NONE; + if (override != NULL && (IsTunnel(t) || DistanceMax(t, GetOtherBridgeEnd(t)) > 1)) { + *override = 1 << GetTunnelBridgeDirection(t); } + return AxisToTrackBits(DiagDirToAxis(GetTunnelBridgeDirection(t))); case MP_ROAD: if (GetRoadTileType(t) != ROAD_TILE_CROSSING) return TRACK_BIT_NONE; |