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

(svn r6983) Use the pool macros for the Station pool

Browse Source
This commit is contained in:
tron
2006-10-28 11:48:21 +00:00
parent 3592db713f
commit f5b45492d3
5 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
station.h
View File

@@ -142,23 +142,7 @@ void UpdateAllStationVirtCoord(void);
void RebuildStationLists(void);
void ResortStationLists(void);
extern MemoryPool _station_pool;
/**
* Get the pointer to the station with index 'index'
*/
static inline Station *GetStation(StationID index)
{
return (Station*)GetItemFromPool(&_station_pool, index);
}
/**
* Get the current size of the StationPool
*/
static inline uint16 GetStationPoolSize(void)
{
return _station_pool.total_items;
}
DECLARE_POOL(Station, Station, 6, 1000)
static inline StationID GetStationArraySize(void)
{
@@ -191,7 +175,7 @@ static inline void DeleteStation(Station *st)
st->xy = 0;
}
#define FOR_ALL_STATIONS_FROM(st, start) for (st = GetStation(start); st != NULL; st = (st->index + 1 < GetStationPoolSize()) ? GetStation(st->index + 1) : NULL) if (IsValidStation(st))
#define FOR_ALL_STATIONS_FROM(st, start) for (st = GetStation(start); st != NULL; st = (st->index + 1U < GetStationPoolSize()) ? GetStation(st->index + 1U) : NULL) if (IsValidStation(st))
#define FOR_ALL_STATIONS(st) FOR_ALL_STATIONS_FROM(st, 0)