X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=a2a73aa94d9337d083346e6e6688f8e47dcb8b56;hb=29878263d8faf9b7e5845e8b1c3d52b139a255cf;hp=07afe2b722112bb4453b4b994ad7b517fff207f1;hpb=1c072afdb1866ba397ee8e6155f5f68c6c7ab4da;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 07afe2b..a2a73aa 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
 {
@@ -40,10 +39,11 @@ private:
 
 	int priority;
 	RouteList routes;
-	bool arriving;
-	const Zone *dest_zone;
-	const Block *dest_block;
+	unsigned arriving;
+	const TrackChain *destination;
+	std::vector<const TrackChain *> waypoints;
 	std::list<Wait> waits;
+	Msp::Time::TimeDelta delay;
 
 	bool update_pending;
 
@@ -57,13 +57,17 @@ 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; }
 
 	virtual void message(const Message &);
-	virtual void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
+	virtual void tick(const Msp::Time::TimeDelta &);
 
 	void save(std::list<Msp::DataFile::Statement> &) const;