summaryrefslogtreecommitdiff
path: root/vehicle.h
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2006-08-22 18:15:17 +0000
committertruelight <truelight@openttd.org>2006-08-22 18:15:17 +0000
commitb23f719ab91a34be3e9d44d1165c789edd4df513 (patch)
tree8fdd9f9cb1552a9d33e7f6c2bbdeccff776cfc62 /vehicle.h
parent1331b4aa9a525bb87c76c38bbc42d33d099bd026 (diff)
downloadopenttd-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 'vehicle.h')
-rw-r--r--vehicle.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/vehicle.h b/vehicle.h
index 760cfb8ea..6a434a15c 100644
--- a/vehicle.h
+++ b/vehicle.h
@@ -375,9 +375,9 @@ static inline bool IsValidVehicle(const Vehicle *v)
*
* @return Returns true if the vehicle-id is in range
*/
-static inline bool IsVehicleIndex(uint index)
+static inline bool IsValidVehicleID(uint index)
{
- return index < GetVehiclePoolSize();
+ return index < GetVehiclePoolSize() && IsValidVehicle(GetVehicle(index));
}
/* Returns order 'index' of a vehicle or NULL when it doesn't exists */