Avoid nested block reservations completely

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

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 72f083d57cc2da491dead13077ad495b716f5942..dc07c191991b7cebe4de15f44d9aa85d91cd00b2 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -41,8 +41,7 @@ namespace R2C2 {
 Layout::Layout(Catalogue &c, Driver *d):
        catalogue(c),
        driver(d),
-       next_turnout_addr(0x800),
-       emitting_block_reserved(false)
+       next_turnout_addr(0x800)
 {
        clock.set_rate(60);
 }
@@ -123,7 +122,7 @@ void Layout::add(Block &b)
 {
        if(track_chains.insert(b))
        {
-               sigc::connection conn = b.signal_reserved.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::block_reserved), sigc::ref(b)));
+               sigc::connection conn = b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
                try
                {
                        signal_track_chain_added.emit(b);
@@ -414,7 +413,7 @@ void Layout::remove_train(Train &t)
                signal_train_removed.emit(t);
 }
 
-void Layout::tick()
+void Layout::tick(float speed)
 {
        if(driver)
                driver->tick();
@@ -425,6 +424,15 @@ void Layout::tick()
                dt = t-last_tick;
        last_tick = t;
 
+       dt *= speed;
+       unsigned count = dt/(10*Time::msec)+1;
+       dt /= count;
+       while(count--)
+               step(dt);
+}
+
+void Layout::step(const Time::TimeDelta &dt)
+{
        if(!driver || !driver->is_halted())
                clock.tick(dt);
 
@@ -525,7 +533,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)
        {
@@ -548,23 +561,6 @@ void Layout::sensor_state_changed(Sensor &sensor, Sensor::State state)
        }
 }
 
-void Layout::block_reserved(Block &block, Train *train)
-{
-       if(emitting_block_reserved)
-               block_reserve_queue.push_back(BlockReservation(block, train));
-       else
-       {
-               SetFlag setf(emitting_block_reserved);
-               signal_block_reserved.emit(block, train);
-               while(!block_reserve_queue.empty())
-               {
-                       BlockReservation br = block_reserve_queue.front();
-                       block_reserve_queue.pop_front();
-                       signal_block_reserved.emit(br.block, br.train);
-               }
-       }
-}
-
 
 template<typename B>
 Layout::Storage<B>::~Storage()
@@ -619,12 +615,6 @@ void Layout::Storage<B>::del()
 }
 
 
-Layout::BlockReservation::BlockReservation(Block &b, Train *t):
-       block(b),
-       train(t)
-{ }
-
-
 Layout::Loader::Loader(Layout &l):
        DataFile::ObjectLoader<Layout>(l)
 {
@@ -638,6 +628,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 +678,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);
 }