X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=c23ad38fb1d39969c2463ebab919ea165a3b0895;hb=70919a9e222568a8ffe610cd5320f3171f298f90;hp=598bf82bcf4c0a1763a22d9b78562b21c4d6e00e;hpb=7c98e23312cf01ce1fa6c1ffd8e36c22d2fa6110;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 598bf82..c23ad38 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -39,7 +39,7 @@ namespace R2C2 {
 Layout::Layout(Catalogue &c, Driver *d):
 	catalogue(c),
 	driver(d),
-	next_turnout_id(0x800)
+	next_turnout_addr(0x800)
 {
 	clock.set_rate(60);
 }
@@ -227,18 +227,18 @@ void Layout::remove(BeamGate &g)
 	remove(static_cast<Sensor &>(g));
 }
 
-unsigned Layout::allocate_turnout_id()
+unsigned Layout::allocate_turnout_address()
 {
-	set<unsigned> used_ids;
+	set<unsigned> used_addrs;
 	const set<Track *> &tracks = objects.get<Track>();
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if((*i)->get_turnout_id())
-			used_ids.insert((*i)->get_turnout_id());
+		if((*i)->get_turnout_address())
+			used_addrs.insert((*i)->get_turnout_address());
 
-	unsigned result = next_turnout_id;
-	while(used_ids.count(result))
+	unsigned result = next_turnout_addr;
+	while(used_addrs.count(result))
 		++result;
-	next_turnout_id = result+1;
+	next_turnout_addr = result+1;
 
 	return result;
 }
@@ -449,8 +449,8 @@ void Layout::save_dynamic(const string &fn) const
 
 	const set<Track *> &tracks = objects.get<Track>();
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(unsigned tid = (*i)->get_turnout_id())
-			writer.write((DataFile::Statement("turnout"), tid, (*i)->get_active_path()));
+		if(unsigned taddr = (*i)->get_turnout_address())
+			writer.write((DataFile::Statement("turnout"), taddr, (*i)->get_active_path()));
 
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 	{
@@ -528,8 +528,7 @@ void Layout::Storage<B>::del()
 
 
 Layout::Loader::Loader(Layout &l):
-	DataFile::ObjectLoader<Layout>(l),
-	new_tracks(false)
+	DataFile::ObjectLoader<Layout>(l)
 {
 	add("base",  &Layout::base);
 	add("beamgate", &Loader::beamgate);
@@ -563,7 +562,6 @@ void Layout::Loader::track(ArticleNumber art_nr)
 {
 	Track *trk = new Track(obj, obj.catalogue.get<TrackType>(art_nr));
 	load_sub(*trk);
-	new_tracks = true;
 	const set<Track *> &tracks = obj.objects.get<Track>();
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		if(*i!=trk)