X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=e3d3770c52a113bf8f4bcb6c813bb381fc899fba;hb=3dd660ffad729fbd6e75e6401f5c7f27b9013faf;hp=34dcce69daeddb8a5f8d20255497eca8a453fcef;hpb=8a2b5c1ac2fc07e280dc678165d2ca58f7d07e32;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 34dcce6..e3d3770 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -34,8 +34,7 @@ private:
 		float speed;
 		Block *first_noncritical;
 		TrainRouter *router;
-		const TrackChain *destination;
-		std::vector<const TrackChain *> waypoints;
+		std::vector<TrainRouter::Waypoint> waypoints;
 		std::vector<const TrainRouteMetric *> metrics;
 		bool has_duration;
 		std::list<Route *> routes;
@@ -78,7 +77,7 @@ private:
 		TrainState state;
 		Msp::Time::TimeDelta delay;
 		Msp::Time::TimeDelta duration;
-		int waypoint;
+		unsigned waypoint;
 		float distance_traveled;
 		float remaining_estimate;
 		Msp::Time::TimeDelta wait_time;
@@ -95,6 +94,7 @@ private:
 		void advance(const Msp::Time::TimeDelta &);
 		void advance_track(unsigned);
 		void update_estimate();
+		bool is_viable() const;
 	};
 
 	struct RoutingStep
@@ -137,6 +137,7 @@ private:
 	std::list<RoutingStep> steps;
 	std::list<RoutingStep> queue;
 	const RoutingStep *goal;
+	Msp::Time::TimeDelta timeout;
 	Result result;
 	PlanningThread *thread;
 
@@ -144,6 +145,7 @@ public:
 	TrainRoutePlanner(Layout &);
 	~TrainRoutePlanner();
 
+	void set_timeout(const Msp::Time::TimeDelta &);
 	Result plan();
 	void plan_async();
 	Result check();