diff -r c9799dd53eec -r 6703cd8d39e0 station.h
--- a/station.h	Tue Aug 22 17:13:49 2006 +0000
+++ b/station.h	Tue Aug 22 18:15:17 2006 +0000
@@ -161,11 +161,6 @@
 	return _station_pool.total_items;
 }
 
-static inline bool IsStationIndex(StationID index)
-{
-	return index < GetStationPoolSize();
-}
-
 /**
  * Check if a station really exists.
  */
@@ -174,6 +169,11 @@
 	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)