X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=4f620764fd8c1a679205f59bb49662ad0fc0d20a;hb=ab92a81163a62348b0f3708ac642e6cfcf64d8d5;hp=28862a221995577d8cb204ca1c546d766fbf8c6b;hpb=a7e320b46a7d4070613b3210c28e65f579750f37;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 28862a2..4f62076 100644
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -9,9 +9,8 @@ namespace R2C2 {
 
 class Block;
 class Layout;
-class Route;
 class Track;
-class Zone;
+class TrackChain;
 
 class TrainRouter: public TrainAI
 {
@@ -25,7 +24,8 @@ public:
 	};
 
 	sigc::signal<void, const Route *> signal_route_changed;
-	sigc::signal<void> signal_arrived;
+	sigc::signal<void, const TrackChain *> signal_arrived;
+	sigc::signal<void, const TrackChain *> signal_waypoint_reached;
 
 private:
 	struct Wait
@@ -41,8 +41,8 @@ private:
 	int priority;
 	RouteList routes;
 	unsigned arriving;
-	const Zone *dest_zone;
-	const Block *dest_block;
+	const TrackChain *destination;
+	std::vector<const TrackChain *> waypoints;
 	std::list<Wait> waits;
 	Msp::Time::TimeDelta delay;
 
@@ -58,10 +58,12 @@ public:
 	void add_wait(Block &, Train *);
 	const Route *get_route() const;
 
-	void set_destination(const Zone &);
-	void set_destination(const Block &);
-	bool has_destination() const;
+	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;
 	void set_departure_delay(const Msp::Time::TimeDelta &);
 	const Msp::Time::TimeDelta &get_departure_delay() const { return delay; }