summaryrefslogtreecommitdiff
path: root/waypoint.h
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2006-08-26 16:34:03 +0000
committertruelight <truelight@openttd.org>2006-08-26 16:34:03 +0000
commitdb8dfcd6e90f13ed0aafec06fc5975967afb1bb5 (patch)
tree7f558c2b1487df44a464aa980693e44cb438c592 /waypoint.h
parentf73a2829f364b07d6f944b8b49e156b9774db39b (diff)
downloadopenttd-db8dfcd6e90f13ed0aafec06fc5975967afb1bb5.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.h6
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));
}