diff options
author | truelight <truelight@openttd.org> | 2006-08-22 18:15:17 +0000 |
---|---|---|
committer | truelight <truelight@openttd.org> | 2006-08-22 18:15:17 +0000 |
commit | b23f719ab91a34be3e9d44d1165c789edd4df513 (patch) | |
tree | 8fdd9f9cb1552a9d33e7f6c2bbdeccff776cfc62 /station.h | |
parent | 1331b4aa9a525bb87c76c38bbc42d33d099bd026 (diff) | |
download | openttd-b23f719ab91a34be3e9d44d1165c789edd4df513.tar.xz |
(svn r6053) -Codechange: renamed all IsXXXIndex to IsValidXXXID
-Codechange: IsValidXXXID now also checks if XXX is really valid, not if the number is within range
Both changes again in preperation of the new mem-pool system, which requires this.
IsValidXXXID is not a bit less pretty, but that will be cleaned up after the new mem-pool system
Diffstat (limited to 'station.h')
-rw-r--r-- | station.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -161,11 +161,6 @@ static inline uint16 GetStationPoolSize(void) return _station_pool.total_items; } -static inline bool IsStationIndex(StationID index) -{ - return index < GetStationPoolSize(); -} - /** * Check if a station really exists. */ @@ -174,6 +169,11 @@ static inline bool IsValidStation(const Station *st) return st->xy != 0; } +static inline bool IsValidStationID(StationID index) +{ + return index < GetStationPoolSize() && IsValidStation(GetStation(index)); +} + #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(st) FOR_ALL_STATIONS_FROM(st, 0) |