diff options
| author | truelight <truelight@openttd.org> | 2006-08-22 18:15:17 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2006-08-22 18:15:17 +0000 |
| commit | b23f719ab91a34be3e9d44d1165c789edd4df513 (patch) | |
| tree | 8fdd9f9cb1552a9d33e7f6c2bbdeccff776cfc62 /waypoint.h | |
| parent | 1331b4aa9a525bb87c76c38bbc42d33d099bd026 (diff) | |
| download | openttd-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 'waypoint.h')
| -rw-r--r-- | waypoint.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/waypoint.h b/waypoint.h index aac46518a..74ba5d8e4 100644 --- a/waypoint.h +++ b/waypoint.h @@ -42,11 +42,6 @@ static inline uint16 GetWaypointPoolSize(void) return _waypoint_pool.total_items; } -static inline bool IsWaypointIndex(uint index) -{ - return index < GetWaypointPoolSize(); -} - /** * Check if a Waypoint really exists. */ @@ -55,6 +50,11 @@ static inline bool IsValidWaypoint(const Waypoint *wp) return wp->xy != 0; } +static inline bool IsValidWaypointID(uint index) +{ + return index < GetWaypointPoolSize() && IsValidWaypoint(GetWaypoint(index)); +} + #define FOR_ALL_WAYPOINTS_FROM(wp, start) for (wp = GetWaypoint(start); wp != NULL; wp = (wp->index + 1 < GetWaypointPoolSize()) ? GetWaypoint(wp->index + 1) : NULL) if (IsValidWaypoint(wp)) #define FOR_ALL_WAYPOINTS(wp) FOR_ALL_WAYPOINTS_FROM(wp, 0) |