diff options
author | celestar <celestar@openttd.org> | 2006-03-02 08:55:12 +0000 |
---|---|---|
committer | celestar <celestar@openttd.org> | 2006-03-02 08:55:12 +0000 |
commit | 9d54e51ef995d2f2d65b12f74ce31cbcbf8848a1 (patch) | |
tree | e514578eea81526bce27d2306272f84907b34d4f /station.h | |
parent | 841e6ab121d1f2d29904e8408b0394c55cbf17f5 (diff) | |
download | openttd-9d54e51ef995d2f2d65b12f74ce31cbcbf8848a1.tar.xz |
(svn r3730) Multistop modifications:
-Codechange: Completely rewritten the slot assignment system. It now consumes less CPU cycles and memory
-Codechange: Increased maximum number of roadstops to 16.
-Fix: Several conditions where a slot becomes unliked from a vehicle
-Codechange: ClearSlot now only takes one parameter, the vehicle
-Feature: Console command 'clearslots' to clear ALL currently assinged slots. debug usage only
-Feature: vehicles that cannot get a slot now wait on the road instead of planlessly blocking stops or circling around
-Codechange: Adjusted debug levels
TODO: Make the slot finder compatible with (a) pathfinder(s).
Diffstat (limited to 'station.h')
-rw-r--r-- | station.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -29,7 +29,7 @@ typedef enum RoadStopType { enum { INVALID_STATION = 0xFFFF, NUM_SLOTS = 2, - ROAD_STOP_LIMIT = 8, + ROAD_STOP_LIMIT = 16, }; typedef uint16 StationID; @@ -202,8 +202,9 @@ static inline RoadStopType GetRoadStopType(TileIndex tile) } RoadStop * GetPrimaryRoadStop(const Station *st, RoadStopType type); +uint GetNumRoadStops(const Station* st, RoadStopType type); RoadStop * AllocateRoadStop( void ); -void ClearSlot(Vehicle *v, RoadStop *rs); +void ClearSlot(Vehicle *v); static inline bool IsTrainStationTile(TileIndex tile) { |