private:
typedef std::list<const Route *> RouteList;
- enum ArrivalState
+ enum TravelState
{
ON_THE_WAY,
WAITING_FOR_SEQUENCE,
+ SEQUENCE_CHECK_PENDING,
RESERVED_TO_END,
ADVANCED_TO_END,
ARRIVED
int priority;
RouteList routes;
RouteList::iterator reserving_route;
- ArrivalState arrival;
+ TravelState state;
std::vector<Waypoint> waypoints;
bool waypoints_changed;
std::vector<TrainRouteMetric *> metrics;
bool metrics_stale;
std::list<SequencePoint> sequence_points;
unsigned current_sequence;
- bool sequence_check_pending;
Msp::Time::TimeDelta delay;
Msp::Time::TimeDelta duration;
Msp::RefPtr<TrainRoutePlanner> planner;
bool create_lead_route();
bool advance_to_track(RouteList::iterator &, const TrackIter &);
- static void get_routers(Layout &, std::vector<TrainRouter *> &);
+ static void get_routers(Layout &, std::vector<TrainRouter *> &, TrainRoutePlanner * = 0);
static void start_planning(Layout &);
static void apply_plan(Layout &, TrainRoutePlanner &);
};