diff options
| author | alberth <alberth@openttd.org> | 2010-11-20 15:44:24 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2010-11-20 15:44:24 +0000 |
| commit | ab50f74d7fa3c1c96de54012ccc197c4800901c8 (patch) | |
| tree | fbee322b7dcec81c6a98a1ee923984d902e834f9 /src/tunnel_map.cpp | |
| parent | 38dc34828ea679e4952f9f30361382e29d2f2e06 (diff) | |
| download | openttd-ab50f74d7fa3c1c96de54012ccc197c4800901c8.tar.xz | |
(svn r21273) -Codechange: Return values should start at the same line.
Diffstat (limited to 'src/tunnel_map.cpp')
| -rw-r--r-- | src/tunnel_map.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/tunnel_map.cpp b/src/tunnel_map.cpp index 47b93adf2..799b39000 100644 --- a/src/tunnel_map.cpp +++ b/src/tunnel_map.cpp @@ -56,10 +56,7 @@ bool IsTunnelInWayDir(TileIndex tile, uint z, DiagDirection dir) height = GetTileZ(tile); } while (z < height); - return - z == height && - IsTunnelTile(tile) && - GetTunnelBridgeDirection(tile) == dir; + return z == height && IsTunnelTile(tile) && GetTunnelBridgeDirection(tile) == dir; } /** @@ -70,7 +67,6 @@ bool IsTunnelInWayDir(TileIndex tile, uint z, DiagDirection dir) */ bool IsTunnelInWay(TileIndex tile, uint z) { - return - IsTunnelInWayDir(tile, z, (TileX(tile) > (MapMaxX() / 2)) ? DIAGDIR_NE : DIAGDIR_SW) || - IsTunnelInWayDir(tile, z, (TileY(tile) > (MapMaxY() / 2)) ? DIAGDIR_NW : DIAGDIR_SE); + return IsTunnelInWayDir(tile, z, (TileX(tile) > (MapMaxX() / 2)) ? DIAGDIR_NE : DIAGDIR_SW) || + IsTunnelInWayDir(tile, z, (TileY(tile) > (MapMaxY() / 2)) ? DIAGDIR_NW : DIAGDIR_SE); } |