Instantly set turnout paths when loading state

[r2c2.git] / source / libr2c2 / layout.cpp

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 72f083d57cc2da491dead13077ad495b716f5942..fe21881a2e4ab46a5f7f1e3b6a6e48c75bf7c2af 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -525,7 +525,12 @@ 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((*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)
        {
@@ -638,6 +643,9 @@ Layout::Loader::Loader(Layout &l):
        add("train", &Loader::train);
        add("turnout", &Loader::turnout);
        add("zone",  &Loader::zone);
+
+       // Deprecated
+       add("turnout", &Loader::turnout2);
 }
 
 void Layout::Loader::beamgate()
@@ -685,8 +693,24 @@ void Layout::Loader::train(const string &n, unsigned addr, const std::string &pr
        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);
 }