petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r6142) -Codechange: added WaypointID (sorry DV, couldn't splits it anymore)

Browse Source 
-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)
This commit is contained in:
truelight
2006-08-26 16:34:03 +00:00
parent f73a2829f3
commit db8dfcd6e9
23 changed files with 172 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
waypoint.h
View File

@@ -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));
}