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

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 26df423..d1428cf 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -30,9 +30,6 @@ class Layout
 public:
 	class Loader: public Msp::DataFile::ObjectLoader<Layout>
 	{
-	private:
-		bool new_tracks;
-
 	public:
 		Loader(Layout &);
 	private:
@@ -91,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);
@@ -122,7 +119,7 @@ public:
 	void remove(Sensor &);
 	void remove(BeamGate &);
 
-	unsigned allocate_turnout_id();
+	unsigned allocate_turnout_address();
 
 	Block &get_block(unsigned) const;
 	void create_blocks();