diff options
author | smatz <smatz@openttd.org> | 2009-05-16 23:44:36 +0000 |
---|---|---|
committer | smatz <smatz@openttd.org> | 2009-05-16 23:44:36 +0000 |
commit | ed1e54bd84074412ea9f273b7cd86aed42d844ce (patch) | |
tree | 4a5ab5dbd304f9a53f8f0065bc6965b1680ded78 /src/vehicle_base.h | |
parent | 6221d74644922ea4bbba3ed9cd8bbec42398f77b (diff) | |
download | openttd-ed1e54bd84074412ea9f273b7cd86aed42d844ce.tar.xz |
(svn r16326) -Codechange: replace GetPoolItemPoolSize() by PoolItem::GetPoolSize()
Diffstat (limited to 'src/vehicle_base.h')
-rw-r--r-- | src/vehicle_base.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vehicle_base.h b/src/vehicle_base.h index a1d451d32..9d611c01a 100644 --- a/src/vehicle_base.h +++ b/src/vehicle_base.h @@ -649,15 +649,15 @@ static inline VehicleID GetMaxVehicleIndex() * _really_ returns the highest index. Now it just returns * the next safe value we are sure about everything is below. */ - return GetVehiclePoolSize() - 1; + return Vehicle::GetPoolSize() - 1; } static inline uint GetNumVehicles() { - return GetVehiclePoolSize(); + return Vehicle::GetPoolSize(); } -#define FOR_ALL_VEHICLES_FROM(v, start) for (v = Vehicle::Get(start); v != NULL; v = (v->index + 1U < GetVehiclePoolSize()) ? Vehicle::Get(v->index + 1) : NULL) if (v->IsValid()) +#define FOR_ALL_VEHICLES_FROM(v, start) for (v = Vehicle::Get(start); v != NULL; v = (v->index + 1U < Vehicle::GetPoolSize()) ? Vehicle::Get(v->index + 1) : NULL) if (v->IsValid()) #define FOR_ALL_VEHICLES(v) FOR_ALL_VEHICLES_FROM(v, 0) /** @@ -667,7 +667,7 @@ static inline uint GetNumVehicles() */ static inline bool IsValidVehicleID(uint index) { - return index < GetVehiclePoolSize() && Vehicle::Get(index)->IsValid(); + return index < Vehicle::GetPoolSize() && Vehicle::Get(index)->IsValid(); } |