X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=c1b6977f3734d45b19f615146c899d0ef22dedc0;hb=c52c0e591be55cb2c7251689c69c642e3cb3601c;hp=28fc80246f522cb48d6f1db88db7e66c917b37b9;hpb=dec294d40194a640e7b4bccf20dd1baa4a87038c;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 28fc802..c1b6977 100644
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -8,9 +8,10 @@
 namespace R2C2 {
 
 class Block;
-class Route;
+class Layout;
 class Track;
-class Zone;
+class TrackChain;
+class TrainRouteMetric;
 
 class TrainRouter: public TrainAI
 {
@@ -24,30 +25,55 @@ 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
+	{
+		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::vector<TrainRouteMetric *> metrics;
+	std::list<Wait> waits;
+	Msp::Time::TimeDelta delay;
+
+	bool update_pending;
 
 public:
 	TrainRouter(Train &);
+	~TrainRouter();
 
 	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 &);
+	bool add_route(const Route &);
+	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;
+	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; }
+
 	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;
 
@@ -56,9 +82,12 @@ private:
 	void train_advanced(Block &);
 	const Route *get_route_for_block(const Block &) const;
 
+	void create_metrics();
 	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