Changeset - r4044:c63689510426
[Not reviewed]
master
0 2 0
tron - 18 years ago 2006-06-19 09:15:16
tron@openttd.org
(svn r5313) Move IsRailWaypoint() to rail_map.h and remove unused enum
2 files changed with 8 insertions and 9 deletions:
0 comments (0 inline, 0 general)
rail_map.h
Show inline comments
 
@@ -60,6 +60,14 @@ static inline RailTileSubtype GetRailTil
 
}
 

	
 

	
 
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);
waypoint.h
Show inline comments
 
@@ -24,11 +24,6 @@ struct Waypoint {
 
	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 @@ static inline bool IsWaypointIndex(uint 
 
#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
0 comments (0 inline, 0 general)