X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=457bdf78cf59c5dd5fcfb4c49db644f991ec888b;hb=eb8b919a1a224c0d6f206d1d29a9b4b8c3a0cac8;hp=835ec484737761663da76d30eb97246d0a6178bd;hpb=3dd660ffad729fbd6e75e6401f5c7f27b9013faf;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 835ec48..457bdf7 100644
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -48,10 +48,11 @@ public:
 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
@@ -66,14 +67,13 @@ private:
 	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;
@@ -118,7 +118,7 @@ private:
 	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 &);
 };