const set<Track *> &tracks = objects.get<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
const set<Track *> &tracks = objects.get<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ const set<Terrain *> &terrains = objects.get<Terrain>();
+ for(set<Terrain *>::const_iterator i=terrains.begin(); i!=terrains.end(); ++i)
+ {
+ DataFile::Statement st("terrain");
+ st.append((*i)->get_type().get_article_number());
+ (*i)->save(st.sub);
+ writer.write(st);
+ }
+
const set<BeamGate *> &gates = objects.get<BeamGate>();
for(set<BeamGate *>::const_iterator i=gates.begin(); i!=gates.end(); ++i)
{
const set<BeamGate *> &gates = objects.get<BeamGate>();
for(set<BeamGate *>::const_iterator i=gates.begin(); i!=gates.end(); ++i)
{
const set<Track *> &tracks = objects.get<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
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()));
{
add("base", &Layout::base);
add("beamgate", &Loader::beamgate);
add("route", &Loader::route);
add("signal", &Loader::signal);
{
add("base", &Layout::base);
add("beamgate", &Loader::beamgate);
add("route", &Loader::route);
add("signal", &Loader::signal);
add("track", &Loader::track);
add("train", &Loader::train);
add("turnout", &Loader::turnout);
add("track", &Loader::track);
add("train", &Loader::train);
add("turnout", &Loader::turnout);
void Layout::Loader::track(ArticleNumber art_nr)
{
Track *trk = new Track(obj, obj.catalogue.get<TrackType>(art_nr));
load_sub(*trk);
void Layout::Loader::track(ArticleNumber art_nr)
{
Track *trk = new Track(obj, obj.catalogue.get<TrackType>(art_nr));
load_sub(*trk);
const set<Track *> &tracks = obj.objects.get<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
if(*i!=trk)
const set<Track *> &tracks = obj.objects.get<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
if(*i!=trk)