mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r5313) Move IsRailWaypoint() to rail_map.h and remove unused enum

release/0.5
tron 2006-06-19 09:15:16 +00:00
parent befc6accba
commit 072312b538
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rail_map.h
View File

@ -60,6 +60,14 @@ static inline RailTileSubtype GetRailTileSubtype(TileIndex tile)
} }
static inline bool IsRailWaypoint(TileIndex t)
{
return
GetRailTileType(t) == RAIL_TILE_DEPOT_WAYPOINT &&
GetRailTileSubtype(t) == RAIL_SUBTYPE_WAYPOINT;
}
static inline RailType GetRailType(TileIndex t) static inline RailType GetRailType(TileIndex t)
{ {
return (RailType)GB(_m[t].m3, 0, 4); return (RailType)GB(_m[t].m3, 0, 4);

9
waypoint.h
View File

@ -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. 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; extern MemoryPool _waypoint_pool;
/** /**
@ -55,10 +50,6 @@ static inline bool IsWaypointIndex(uint index)
#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_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) #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 * Fetch a waypoint by tile