X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=b4eb8faacdbdb52d5d4786fe8495c747762c1c6a;hb=0d0b5fcbaf3e8eb1cbfd9764d19792c4383cce7b;hp=c7dc346d61db45c652c3f553fc438c92e9f8576f;hpb=6cfe927c34e7b866818502b39073b74b47666ba7;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index c7dc346..b4eb8fa 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -248,7 +248,7 @@ unsigned Layout::allocate_turnout_address()
 	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_address())
+		if((*i)->get_type().is_turnout())
 			used_addrs.insert((*i)->get_turnout_address());
 
 	unsigned result = next_turnout_addr;
@@ -480,8 +480,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 taddr = (*i)->get_turnout_address())
-			writer.write((DataFile::Statement("turnout"), taddr, (*i)->get_active_path()));
+		if((*i)->get_type().is_turnout())
+			writer.write((DataFile::Statement("turnout"), (*i)->get_turnout_address(), (*i)->get_active_path()));
 
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 	{