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/rail_map.h | |
| parent | 38dc34828ea679e4952f9f30361382e29d2f2e06 (diff) | |
| download | openttd-ab50f74d7fa3c1c96de54012ccc197c4800901c8.tar.xz | |
(svn r21273) -Codechange: Return values should start at the same line.
Diffstat (limited to 'src/rail_map.h')
| -rw-r--r-- | src/rail_map.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/rail_map.h b/src/rail_map.h index d05f54146..59a1feeda 100644 --- a/src/rail_map.h +++ b/src/rail_map.h @@ -424,9 +424,7 @@ static inline bool IsSignalPresent(TileIndex t, byte signalbit) static inline bool HasSignalOnTrack(TileIndex tile, Track track) { assert(IsValidTrack(track)); - return - GetRailTileType(tile) == RAIL_TILE_SIGNALS && - (GetPresentSignals(tile) & SignalOnTrack(track)) != 0; + return GetRailTileType(tile) == RAIL_TILE_SIGNALS && (GetPresentSignals(tile) & SignalOnTrack(track)) != 0; } /** @@ -439,9 +437,7 @@ static inline bool HasSignalOnTrack(TileIndex tile, Track track) static inline bool HasSignalOnTrackdir(TileIndex tile, Trackdir trackdir) { assert (IsValidTrackdir(trackdir)); - return - GetRailTileType(tile) == RAIL_TILE_SIGNALS && - GetPresentSignals(tile) & SignalAlongTrackdir(trackdir); + return GetRailTileType(tile) == RAIL_TILE_SIGNALS && GetPresentSignals(tile) & SignalAlongTrackdir(trackdir); } /** @@ -477,10 +473,8 @@ static inline void SetSignalStateByTrackdir(TileIndex tile, Trackdir trackdir, S */ static inline bool HasPbsSignalOnTrackdir(TileIndex tile, Trackdir td) { - return - IsTileType(tile, MP_RAILWAY) && - HasSignalOnTrackdir(tile, td) && - IsPbsSignal(GetSignalType(tile, TrackdirToTrack(td))); + return IsTileType(tile, MP_RAILWAY) && HasSignalOnTrackdir(tile, td) && + IsPbsSignal(GetSignalType(tile, TrackdirToTrack(td))); } /** @@ -491,11 +485,8 @@ static inline bool HasPbsSignalOnTrackdir(TileIndex tile, Trackdir td) */ static inline bool HasOnewaySignalBlockingTrackdir(TileIndex tile, Trackdir td) { - return - IsTileType(tile, MP_RAILWAY) && - HasSignalOnTrackdir(tile, ReverseTrackdir(td)) && - !HasSignalOnTrackdir(tile, td) && - IsOnewaySignal(tile, TrackdirToTrack(td)); + return IsTileType(tile, MP_RAILWAY) && HasSignalOnTrackdir(tile, ReverseTrackdir(td)) && + !HasSignalOnTrackdir(tile, td) && IsOnewaySignal(tile, TrackdirToTrack(td)); } |