const set<Track *> &tracks = objects.get<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
if((*i)->get_type().is_turnout())
- writer.write((DataFile::Statement("turnout"), (*i)->get_turnout_address(), (*i)->get_active_path()));
+ {
+ DataFile::Statement st("turnout");
+ st.append((*i)->get_turnout_address());
+ (*i)->save_dynamic(st.sub);
+ writer.write(st);
+ }
for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
{
add("train", &Loader::train);
add("turnout", &Loader::turnout);
add("zone", &Loader::zone);
+
+ // Deprecated
+ add("turnout", &Loader::turnout2);
}
void Layout::Loader::beamgate()
load_sub(*trn);
}
-void Layout::Loader::turnout(unsigned addr, unsigned path)
+void Layout::Loader::turnout(unsigned addr)
+{
+ /* Kinda slow, but maintaining a map of turnouts seems more trouble than
+ it's worth at this point. */
+ const set<Track *> &tracks = obj.objects.get<Track>();
+ for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ if((*i)->get_turnout_address()==addr)
+ {
+ load_sub(**i);
+ return;
+ }
+
+ throw key_error(addr);
+}
+
+void Layout::Loader::turnout2(unsigned addr, unsigned path)
{
+ // XXX Discrepancy between ids and addresses
if(obj.driver)
obj.driver->set_turnout(addr, path);
}