diff options
| author | truelight <truelight@openttd.org> | 2006-08-26 16:34:03 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2006-08-26 16:34:03 +0000 |
| commit | 65f5ec13f678b98686abc8e599fc87adc81c5d26 (patch) | |
| tree | 7f558c2b1487df44a464aa980693e44cb438c592 /waypoint.h | |
| parent | 4d43389c286f5ea2eccface64ef7b9afc5647ebc (diff) | |
| download | openttd-65f5ec13f678b98686abc8e599fc87adc81c5d26.tar.xz | |
(svn r6142) -Codechange: added WaypointID (sorry DV, couldn't splits it anymore)
-Codechange: introduced DestinationID, which is in fact an union of several types
Used in Order struct, so no longer StationID is abused for all targets.
Hangars are a big exception, as they use a station-id with GOTO_DEPOT (go figure)
Diffstat (limited to 'waypoint.h')
| -rw-r--r-- | waypoint.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/waypoint.h b/waypoint.h index 74ba5d8e4..9949ffaa4 100644 --- a/waypoint.h +++ b/waypoint.h @@ -8,7 +8,7 @@ struct Waypoint { TileIndex xy; ///< Tile of waypoint - StationID index; ///< Index of waypoint + WaypointID index; ///< Index of waypoint TownID town_index; ///< Town associated with the waypoint byte town_cn; ///< The Nth waypoint for this town (consecutive number) @@ -29,7 +29,7 @@ extern MemoryPool _waypoint_pool; /** * Get the pointer to the waypoint with index 'index' */ -static inline Waypoint *GetWaypoint(uint index) +static inline Waypoint *GetWaypoint(WaypointID index) { return (Waypoint*)GetItemFromPool(&_waypoint_pool, index); } @@ -50,7 +50,7 @@ static inline bool IsValidWaypoint(const Waypoint *wp) return wp->xy != 0; } -static inline bool IsValidWaypointID(uint index) +static inline bool IsValidWaypointID(WaypointID index) { return index < GetWaypointPoolSize() && IsValidWaypoint(GetWaypoint(index)); } |