summaryrefslogtreecommitdiff
path: root/depot.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 /depot.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 'depot.h')
-rw-r--r--depot.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/depot.h b/depot.h
index 4d79e179e..864237cf0 100644
--- a/depot.h
+++ b/depot.h
@@ -35,11 +35,6 @@ static inline uint16 GetDepotPoolSize(void)
return _depot_pool.total_items;
}
-static inline bool IsDepotIndex(uint index)
-{
- return index < GetDepotPoolSize();
-}
-
/**
* Check if a depot really exists.
*/
@@ -48,6 +43,11 @@ static inline bool IsValidDepot(const Depot* depot)
return depot->xy != 0;
}
+static inline bool IsValidDepotID(uint index)
+{
+ return index < GetDepotPoolSize() && IsValidDepot(GetDepot(index));
+}
+
#define FOR_ALL_DEPOTS_FROM(d, start) for (d = GetDepot(start); d != NULL; d = (d->index + 1 < GetDepotPoolSize()) ? GetDepot(d->index + 1) : NULL) if (IsValidDepot(d))
#define FOR_ALL_DEPOTS(d) FOR_ALL_DEPOTS_FROM(d, 0)