X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=91b7bac1a4e0730afb2e7b278911f4d74b4c5334;hb=e8d2abb48b5236cc3455a035628292ae7908240e;hp=47a409cd7cb2bdb36064f753e5c2f9cadd4bca77;hpb=0ac334781fcb5029e4ea9236a8e93f43169eb7f2;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 47a409c..91b7bac 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,9 +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;
-	unsigned arriving;
+	RouteList::iterator reserving_route;
+	ArrivalState arrival;
 	const TrackChain *destination;
 	std::vector<const TrackChain *> waypoints;
 	bool destination_changed;
@@ -56,6 +66,7 @@ private:
 	unsigned current_sequence;
 	bool sequence_check_pending;
 	Msp::Time::TimeDelta delay;
+	Msp::Time::TimeDelta duration;
 	Msp::RefPtr<TrainRoutePlanner> planner;
 
 public:
@@ -81,6 +92,8 @@ public:
 	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 &);
@@ -90,12 +103,12 @@ public:
 private:
 	void block_reserved(Block &, Train *);
 	void train_advanced(Block &);
-	const Route *get_route_for_block(const Block &) const;
+	void train_rear_advanced(Block &);
 
 	void create_metrics();
 	Route *create_lead_route(Route *, const Route *);
-	bool advance_route(RouteList::iterator &, const Block &);
-	bool is_on_route(const Block &);
+	bool is_valid_for_track(const Route &, Track &) const;
+	bool advance_to_track(RouteList::iterator &, Track &);
 
 	static void start_planning(Layout &);
 };