summaryrefslogtreecommitdiff
path: root/src/road_map.h
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2008-02-18 18:35:36 +0000
committersmatz <smatz@openttd.org>2008-02-18 18:35:36 +0000
commit509b3a324728b01d958cfed9df42985a308b8cf8 (patch)
tree0f5f41084eb7a273e293180f8bdedd4eb61bc243 /src/road_map.h
parentc7a8080c3a27f8541f5d3943b0138293c2b068c5 (diff)
downloadopenttd-509b3a324728b01d958cfed9df42985a308b8cf8.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.h13
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)