delete trains.begin()->second;
while(!routes.empty())
delete *routes.begin();
+ while(!zones.empty())
+ delete *zones.begin();
while(!tracks.empty())
delete *tracks.begin();
while(!blocks.empty())
}
}
-unsigned Layout::allocate_turnout_id(bool dbl)
+unsigned Layout::allocate_turnout_id()
{
set<unsigned> used_ids;
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
used_ids.insert((*i)->get_turnout_id());
unsigned result = next_turnout_id;
- while(used_ids.count(result) || (dbl && used_ids.count(result+1)))
+ while(used_ids.count(result))
++result;
- next_turnout_id = result+1+dbl;
+ next_turnout_id = result+1;
return result;
}
}
}
-void Layout::save_trains(const string &fn) const
+void Layout::save_dynamic(const string &fn) const
{
IO::BufferedFile out(fn, IO::M_WRITE);
DataFile::Writer writer(out);
+ 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()));
+
for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
{
DataFile::Statement st("train");
add("route", static_cast<void (Loader::*)()>(&Loader::route));
add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
add("train", static_cast<void (Loader::*)(ArticleNumber, unsigned, const std::string &)>(&Loader::train));
+ add("turnout", &Loader::turnout);
add("zone", &Loader::zone);
// Deprecated aliases
load_sub(*trn);
}
+void Layout::Loader::turnout(unsigned addr, unsigned path)
+{
+ if(obj.driver)
+ obj.driver->set_turnout(addr, path);
+}
+
void Layout::Loader::zone()
{
Zone *zne = new Zone(obj);