X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=4f620764fd8c1a679205f59bb49662ad0fc0d20a;hb=4232c65cb556d278dee218866de77402ff888f1e;hp=6aae439c3c8a48a21ad4324b98aae02fa852a417;hpb=d0af7846e05691d65d8021e46c8f81e8ca05199a;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 6aae439..4f62076 100644
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -8,9 +8,9 @@
 namespace R2C2 {
 
 class Block;
-class Route;
+class Layout;
 class Track;
-class Zone;
+class TrackChain;
 
 class TrainRouter: public TrainAI
 {
@@ -21,34 +21,54 @@ public:
 		Loader(TrainRouter &);
 	private:
 		void route(const std::string &);
-		void tag(const std::string &);
 	};
 
 	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
+	{
+		Block *block;
+		Train *train;
+
+		Wait();
+	};
+
 	typedef std::list<const Route *> RouteList;
 
 	int priority;
 	RouteList routes;
-	bool arriving;
-	const Train *yielding_to;
+	unsigned arriving;
+	const TrackChain *destination;
+	std::vector<const TrackChain *> waypoints;
+	std::list<Wait> waits;
+	Msp::Time::TimeDelta delay;
+
+	bool update_pending;
 
 public:
 	TrainRouter(Train &);
 
 	void set_priority(int);
 	int get_priority() const { return priority; }
-	void yield_to(const Train &);
 
 	bool set_route(const Route *);
-	bool go_to(Track &);
-	bool go_to(const Zone &);
+	void add_wait(Block &, Train *);
 	const Route *get_route() 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;
 
@@ -60,6 +80,8 @@ private:
 	Route *create_lead_route(Route *, const Route *);
 	bool advance_route(RouteList::iterator &, const Block &);
 	bool is_on_route(const Block &);
+
+	static void create_plans(Layout &);
 };
 
 } // namespace R2C2