dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index)

Browse Source
This commit is contained in:
smatz
2009-05-16 23:34:14 +00:00
parent f9b692c921
commit d495dc5dbc
116 changed files with 645 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/waypoint.h
View File

@@ -42,10 +42,10 @@ struct Waypoint : PoolItem<Waypoint, WaypointID, &_Waypoint_pool> {
static inline bool IsValidWaypointID(WaypointID index)
{
return index < GetWaypointPoolSize() && GetWaypoint(index)->IsValid();
return index < GetWaypointPoolSize() && Waypoint::Get(index)->IsValid();
}
#define FOR_ALL_WAYPOINTS_FROM(wp, start) for (wp = GetWaypoint(start); wp != NULL; wp = (wp->index + 1U < GetWaypointPoolSize()) ? GetWaypoint(wp->index + 1U) : NULL) if (wp->IsValid())
#define FOR_ALL_WAYPOINTS_FROM(wp, start) for (wp = Waypoint::Get(start); wp != NULL; wp = (wp->index + 1U < GetWaypointPoolSize()) ? Waypoint::Get(wp->index + 1U) : NULL) if (wp->IsValid())
#define FOR_ALL_WAYPOINTS(wp) FOR_ALL_WAYPOINTS_FROM(wp, 0)
@@ -57,7 +57,7 @@ static inline bool IsValidWaypointID(WaypointID index)
static inline Waypoint *GetWaypointByTile(TileIndex tile)
{
assert(IsRailWaypointTile(tile));
return GetWaypoint(GetWaypointIndex(tile));
return Waypoint::Get(GetWaypointIndex(tile));
}
CommandCost RemoveTrainWaypoint(TileIndex tile, DoCommandFlag flags, bool justremove);