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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 6aae439..b36a013 100644
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -8,6 +8,7 @@
 namespace R2C2 {
 
 class Block;
+class Layout;
 class Route;
 class Track;
 class Zone;
@@ -21,34 +22,48 @@ 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;
 
 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 Zone *dest_zone;
+	const Block *dest_block;
+	std::list<Wait> waits;
+
+	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 Zone &);
+	void set_destination(const Block &);
+	bool has_destination() const;
+	bool is_destination(Track &) const;
+
 	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 +75,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