X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=ad77f31b914b766c5c91af88208ddb6253dbf784;hb=d3d1850e950f3c38c8ef983228013fc82c287ec4;hp=835ec484737761663da76d30eb97246d0a6178bd;hpb=279f10b0dffc4b207b7998ac2761514b80d57780;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 835ec48..ad77f31 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;