summaryrefslogtreecommitdiff
path: root/vehicle.h
diff options
context:
space:
mode:
authormatthijs <matthijs@openttd.org>2006-12-05 13:58:20 +0000
committermatthijs <matthijs@openttd.org>2006-12-05 13:58:20 +0000
commit9218fc16e6fff350e6209b6b90b8597fc431f00f (patch)
treee23ebc401e3e8f7037ad38701e00a6bf1fb61136 /vehicle.h
parent681f994d16a71813144352b3a6ef05a22cb8b3ff (diff)
downloadopenttd-9218fc16e6fff350e6209b6b90b8597fc431f00f.tar.xz
(svn r7372) - CodeChange: Rename all GetXXXArraySize() functions to GetNumXXX() and add GetMaxXXXIndex() functions. This prepares for the new pool interface.
Diffstat (limited to 'vehicle.h')
-rw-r--r--vehicle.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/vehicle.h b/vehicle.h
index 9f842b155..1aa24ee84 100644
--- a/vehicle.h
+++ b/vehicle.h
@@ -370,13 +370,18 @@ Direction GetDirectionTowards(const Vehicle* v, int x, int y);
DECLARE_OLD_POOL(Vehicle, Vehicle, 9, 125)
-static inline VehicleID GetVehicleArraySize(void)
+static inline VehicleID GetMaxVehicleIndex(void)
{
/* TODO - This isn't the real content of the function, but
* with the new pool-system this will be replaced with one that
- * _really_ returns the highest index + 1. Now it just returns
+ * _really_ returns the highest index. Now it just returns
* the next safe value we are sure about everything is below.
*/
+ return GetVehiclePoolSize() - 1;
+}
+
+static inline uint GetNumVehicles(void)
+{
return GetVehiclePoolSize();
}