X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=498a45a94f7552ba4c36ddf222e938765d919494;hb=e507f9267ca940ee6af70e948f34da94dd26d181;hp=26df423ed731b3f461f912ee04b4c57e19fde08e;hpb=c4daf1cc6b53cae34e46d4125a993ceed500de1a;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 26df423..498a45a 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -30,15 +30,13 @@ 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 terrain(ArticleNumber);
 		void track(ArticleNumber);
 		void train(ArticleNumber, unsigned, const std::string &);
 		void turnout(unsigned, unsigned);
@@ -91,7 +89,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);
@@ -122,7 +120,7 @@ public:
 	void remove(Sensor &);
 	void remove(BeamGate &);
 
-	unsigned allocate_turnout_id();
+	unsigned allocate_turnout_address();
 
 	Block &get_block(unsigned) const;
 	void create_blocks();