X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=44c4cde42efd861b804c3008525bc33ee62d0ef5;hb=b42a312323d36775ab550630b3ee818c3b948bf6;hp=59eae083d05253b6d8c7d5a5e80ad0498d136c94;hpb=3313694dbe8775b5fd6e1a7eaafe0be9179fcb85;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 59eae08..44c4cde 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -34,8 +34,10 @@ public:
 		Loader(Layout &);
 	private:
 		void beamgate();
+		void clock();
 		void route();
 		void signal(ArticleNumber);
+		void terrain(ArticleNumber);
 		void track(ArticleNumber);
 		void train(ArticleNumber, unsigned, const std::string &);
 		void turnout(unsigned, unsigned);
@@ -88,7 +90,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);
@@ -97,7 +99,7 @@ public:
 	Catalogue &get_catalogue() const { return catalogue; }
 	bool has_driver() const { return driver; }
 	Driver &get_driver() const;
-	const Clock &get_clock() const { return clock; }
+	Clock &get_clock() { return clock; }
 	const std::string &get_base() const { return base; }
 
 	void add(Object &);
@@ -119,7 +121,7 @@ public:
 	void remove(Sensor &);
 	void remove(BeamGate &);
 
-	unsigned allocate_turnout_id();
+	unsigned allocate_turnout_address();
 
 	Block &get_block(unsigned) const;
 	void create_blocks();