summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-04-10 20:38:59 +0000
committertron <tron@openttd.org>2006-04-10 20:38:59 +0000
commitf4a8818dbfd894cc8f601fddd12bf44c3ba4fc13 (patch)
tree260b650403d7fa2f913216f7766ef458141656e6
parent8166a531792c2e9cd7f789618879658941f17010 (diff)
downloadopenttd-f4a8818dbfd894cc8f601fddd12bf44c3ba4fc13.tar.xz
(svn r4348) Move IsLevelCrossing() from rail.h to road_map.h
-rw-r--r--rail.h7
-rw-r--r--road_map.h5
2 files changed, 5 insertions, 7 deletions
diff --git a/rail.h b/rail.h
index 12dbe4f61..f8357ed35 100644
--- a/rail.h
+++ b/rail.h
@@ -428,13 +428,6 @@ static inline SignalState GetSignalState(TileIndex tile, Trackdir trackdir)
*/
RailType GetTileRailType(TileIndex tile, Trackdir trackdir);
-/**
- * Returns whether the given tile is a level crossing.
- */
-static inline bool IsLevelCrossing(TileIndex tile)
-{
- return (_m[tile].m5 & 0xF0) == 0x10;
-}
/**
* Gets the transport type of the given track on the given crossing tile.
diff --git a/road_map.h b/road_map.h
index d7858cfc9..b93dd8581 100644
--- a/road_map.h
+++ b/road_map.h
@@ -40,6 +40,11 @@ static inline RoadType GetRoadType(TileIndex t)
return GB(_m[t].m5, 4, 4);
}
+static inline bool IsLevelCrossing(TileIndex t)
+{
+ return GetRoadType(t) == ROAD_CROSSING;
+}
+
static inline RoadBits GetRoadBits(TileIndex t)
{