X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=5d52f10186d6699e709fb6c2967dcf1b3cdf5aff;hb=0a2bd90a3d4f5e7333eba59f29e4a0fbcb11175e;hp=c7572c0df41cb48c548fa2c4b0cb40f6afdd4453;hpb=8776713b20fdc7cdd09f7e2363679ebd06665d32;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index c7572c0..5d52f10 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;
@@ -81,6 +81,7 @@ private:
 		float distance_traveled;
 		float remaining_estimate;
 		Msp::Time::TimeDelta wait_time;
+		Msp::Time::TimeDelta estimated_wait;
 		int blocked_by;
 
 		TrainRoutingState(TrainRoutingInfo &);
@@ -88,6 +89,7 @@ private:
 		~TrainRoutingState();
 
 		Msp::Time::TimeDelta get_time_to_next_track() const;
+		Msp::Time::TimeDelta get_time_to_pass(Track &) const;
 		bool is_occupying(Track &) const;
 		bool check_arrival();
 		void advance(float);
@@ -109,6 +111,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;