X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=7a560a11904d7475b961198d191b6103585ec311;hb=462a04be004ab4b0ff3ce14c51a19b50271b17c7;hp=3c23496710a7b8e3b8df004ca40f1a988faf5e26;hpb=d4c2cc962dc4c7b11c2db360fef7a80de3334c11;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 3c23496..7a560a1 100644
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -25,10 +25,6 @@ public:
 		void route(const std::string &);
 	};
 
-	sigc::signal<void, const Route *> signal_route_changed;
-	sigc::signal<void, const TrackChain *> signal_arrived;
-	sigc::signal<void, const TrackChain *> signal_waypoint_reached;
-
 	struct SequencePoint
 	{
 		Block *block;
@@ -44,10 +40,23 @@ public:
 private:
 	typedef std::list<const Route *> RouteList;
 
+	enum ArrivalState
+	{
+		ON_THE_WAY,
+		RESERVED_TO_END,
+		ARRIVED
+	};
+
+public:
+	sigc::signal<void, const Route *> signal_route_changed;
+	sigc::signal<void, const TrackChain *> signal_arrived;
+	sigc::signal<void, const TrackChain *> signal_waypoint_reached;
+
+private:
 	int priority;
 	RouteList routes;
 	RouteList::iterator reserving_route;
-	unsigned arriving;
+	ArrivalState arrival;
 	const TrackChain *destination;
 	std::vector<const TrackChain *> waypoints;
 	bool destination_changed;
@@ -57,6 +66,7 @@ private:
 	unsigned current_sequence;
 	bool sequence_check_pending;
 	Msp::Time::TimeDelta delay;
+	Msp::Time::TimeDelta duration;
 	Msp::RefPtr<TrainRoutePlanner> planner;
 
 public:
@@ -75,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 &);
@@ -91,9 +102,10 @@ public:
 private:
 	void block_reserved(Block &, Train *);
 	void train_advanced(Block &);
+	void train_rear_advanced(Block &);
 
 	void create_metrics();
-	Route *create_lead_route(Route *, const Route *);
+	bool create_lead_route();
 	bool is_valid_for_track(const Route &, Track &) const;
 	bool advance_to_track(RouteList::iterator &, Track &);