diff options
author | smatz <smatz@openttd.org> | 2008-02-18 18:35:36 +0000 |
---|---|---|
committer | smatz <smatz@openttd.org> | 2008-02-18 18:35:36 +0000 |
commit | 4a329de9420c6dbbe156b88da1bdcc2432f5f460 (patch) | |
tree | 0f5f41084eb7a273e293180f8bdedd4eb61bc243 /src/road_map.h | |
parent | 97013cd8c4d1ea12aaed5ba96706b61ac14873ab (diff) | |
download | openttd-4a329de9420c6dbbe156b88da1bdcc2432f5f460.tar.xz |
(svn r12179) -Codechange: use GetCrossingRailTrack() and GetCrossingRailAxis() to improve code readability
Diffstat (limited to 'src/road_map.h')
-rw-r--r-- | src/road_map.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/road_map.h b/src/road_map.h index 305c77375..35a3f9cf2 100644 --- a/src/road_map.h +++ b/src/road_map.h @@ -206,14 +206,25 @@ static inline Axis GetCrossingRoadAxis(TileIndex t) return (Axis)GB(_m[t].m4, 6, 1); } +static inline Axis GetCrossingRailAxis(TileIndex t) +{ + assert(IsLevelCrossing(t)); + return OtherAxis((Axis)GetCrossingRoadAxis(t)); +} + static inline RoadBits GetCrossingRoadBits(TileIndex tile) { return GetCrossingRoadAxis(tile) == AXIS_X ? ROAD_X : ROAD_Y; } +static inline Track GetCrossingRailTrack(TileIndex tile) +{ + return AxisToTrack(GetCrossingRailAxis(tile)); +} + static inline TrackBits GetCrossingRailBits(TileIndex tile) { - return AxisToTrackBits(OtherAxis(GetCrossingRoadAxis(tile))); + return AxisToTrackBits(GetCrossingRailAxis(tile)); } static inline bool IsCrossingBarred(TileIndex t) |