X-Git-Url: http://git.tdb.fi/?p=r2c2.git;a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=3076c3978efa5ed0b27edae5cec7b4130e72afa7;hp=9a9978137cfeb58caa9164e66f41ab3b2ee1c5cd;hb=528c4f8760ac54fb2d1f3002248ecf6774956030;hpb=19a73af1fb956636cb8b9d563ffb6a42e827a5bf

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 9a99781..3076c39 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -34,7 +34,7 @@ private:
 		float speed;
 		Block *first_noncritical;
 		TrainRouter *router;
-		std::vector<const TrackChain *> waypoints;
+		std::vector<TrainRouter::Waypoint> waypoints;
 		std::vector<const TrainRouteMetric *> metrics;
 		bool has_duration;
 		std::list<Route *> routes;
@@ -109,6 +109,7 @@ private:
 		RoutingStep(const RoutingStep *);
 
 		void create_successors(std::list<RoutingStep> &) const;
+		static void create_successor(RoutingStep &, unsigned, unsigned, std::list<RoutingStep> &);
 		bool update_states();
 		bool check_deadlocks() const;
 		int get_occupant(Track &) const;
@@ -137,6 +138,7 @@ private:
 	std::list<RoutingStep> steps;
 	std::list<RoutingStep> queue;
 	const RoutingStep *goal;
+	Msp::Time::TimeDelta timeout;
 	Result result;
 	PlanningThread *thread;
 
@@ -144,6 +146,7 @@ public:
 	TrainRoutePlanner(Layout &);
 	~TrainRoutePlanner();
 
+	void set_timeout(const Msp::Time::TimeDelta &);
 	Result plan();
 	void plan_async();
 	Result check();