X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=3d8b72246f2d02ce492b7c6672ba9a4ee5c1711a;hb=5c3d55f48318bb16865012c13619990004747090;hp=4f51b3e107878b07e37cd86fa38d7509d8527208;hpb=e5c244baa4058dbfc0c5caee64e6c83523751924;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 4f51b3e..3d8b722 100644
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -66,6 +66,7 @@ private:
 	unsigned current_sequence;
 	bool sequence_check_pending;
 	Msp::Time::TimeDelta delay;
+	Msp::Time::TimeDelta duration;
 	Msp::RefPtr<TrainRoutePlanner> planner;
 
 public:
@@ -84,13 +85,14 @@ private:
 public:
 	void set_destination(const TrackChain &);
 	const TrackChain *get_destination() const { return destination; }
-	bool is_destination(Track &) const;
 	void add_waypoint(const TrackChain &);
 	unsigned get_n_waypoints() const { return waypoints.size(); }
-	bool is_waypoint(unsigned, Track &) const;
+	const TrackChain &get_waypoint(unsigned) const;
 	const TrainRouteMetric &get_metric(int = -1) const;
 	void set_departure_delay(const Msp::Time::TimeDelta &);
 	const Msp::Time::TimeDelta &get_departure_delay() const { return delay; }
+	void set_trip_duration(const Msp::Time::TimeDelta &);
+	const Msp::Time::TimeDelta &get_trip_duration() const { return duration; }
 
 	virtual void message(const Message &);
 	virtual void tick(const Msp::Time::TimeDelta &);
@@ -103,9 +105,9 @@ private:
 	void train_rear_advanced(Block &);
 
 	void create_metrics();
-	Route *create_lead_route(Route *, const Route *);
-	bool is_valid_for_track(const Route &, Track &) const;
-	bool advance_to_track(RouteList::iterator &, Track &);
+	bool create_lead_route();
+	bool is_valid_for_track(const Route &, const TrackIter &) const;
+	bool advance_to_track(RouteList::iterator &, const TrackIter &);
 
 	static void start_planning(Layout &);
 };