From b23f719ab91a34be3e9d44d1165c789edd4df513 Mon Sep 17 00:00:00 2001 From: truelight Date: Tue, 22 Aug 2006 18:15:17 +0000 Subject: (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 --- station.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'station.h') diff --git a/station.h b/station.h index c28e6d093..1a343410d 100644 --- a/station.h +++ b/station.h @@ -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) -- cgit v1.2.3-70-g09d2