X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=d1428cf70100070972a8758ee9ad0782e5d8b9fd;hb=4980a05569d29e19cb7af0d31627e17a94353a3b;hp=6725a23e8c547510fe65fa1c7442e5a80ec6d5e3;hpb=e72050508512570d3cb1bcce768b155a71fe05e5;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 6725a23..d1428cf 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -12,6 +12,7 @@
 namespace R2C2 {
 
 class ArticleNumber;
+class BeamGate;
 class Block;
 class Catalogue;
 class Driver;
@@ -29,12 +30,10 @@ class Layout
 public:
 	class Loader: public Msp::DataFile::ObjectLoader<Layout>
 	{
-	private:
-		bool new_tracks;
-
 	public:
 		Loader(Layout &);
 	private:
+		void beamgate();
 		void route();
 		void signal(ArticleNumber);
 		void track(ArticleNumber);
@@ -89,7 +88,7 @@ private:
 	Storage<Sensor> sensors;
 	std::map<unsigned, Train *> trains;
 	Msp::Time::TimeStamp last_tick;
-	unsigned next_turnout_id;
+	unsigned next_turnout_addr;
 
 public:
 	Layout(Catalogue &, Driver * = 0);
@@ -106,6 +105,7 @@ public:
 	void add(TrackChain &);
 	void add(Block &);
 	void add(Sensor &);
+	void add(BeamGate &);
 
 	template<typename T>
 	const std::set<T *> &get_all() const;
@@ -117,8 +117,9 @@ public:
 	void remove(Track &);
 	void remove(TrackChain &);
 	void remove(Sensor &);
+	void remove(BeamGate &);
 
-	unsigned allocate_turnout_id();
+	unsigned allocate_turnout_address();
 
 	Block &get_block(unsigned) const;
 	void create_blocks();