Mercurial > hg > openttd
changeset 4044:904f22a3889f draft
(svn r5313) Move IsRailWaypoint() to rail_map.h and remove unused enum
author | tron <tron@openttd.org> |
---|---|
date | Mon, 19 Jun 2006 09:15:16 +0000 |
parents | 824fd31ce2d0 |
children | ee56e8a131e6 |
files | rail_map.h waypoint.h |
diffstat | 2 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/rail_map.h +++ b/rail_map.h @@ -60,6 +60,14 @@ } +static inline bool IsRailWaypoint(TileIndex t) +{ + return + GetRailTileType(t) == RAIL_TILE_DEPOT_WAYPOINT && + GetRailTileSubtype(t) == RAIL_SUBTYPE_WAYPOINT; +} + + static inline RailType GetRailType(TileIndex t) { return (RailType)GB(_m[t].m3, 0, 4);
--- a/waypoint.h +++ b/waypoint.h @@ -24,11 +24,6 @@ byte deleted; ///< Delete counter. If greater than 0 then it is decremented until it reaches 0; the waypoint is then is deleted. }; -enum { - RAIL_TILE_WAYPOINT = 0xC4, - RAIL_WAYPOINT_TRACK_MASK = 1, -}; - extern MemoryPool _waypoint_pool; /** @@ -55,10 +50,6 @@ #define FOR_ALL_WAYPOINTS_FROM(wp, start) for (wp = GetWaypoint(start); wp != NULL; wp = (wp->index + 1 < GetWaypointPoolSize()) ? GetWaypoint(wp->index + 1) : NULL) #define FOR_ALL_WAYPOINTS(wp) FOR_ALL_WAYPOINTS_FROM(wp, 0) -static inline bool IsRailWaypoint(TileIndex tile) -{ - return (_m[tile].m5 & 0xFC) == 0xC4; -} /** * Fetch a waypoint by tile