Don't reset router to free run mode until allocator has deactivated

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

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index efc1e0f74cbc97627de661b40caa4cc09dd6ac8e..6cb0eb3634ae334cca8714b87f5d6fb7ae5251bd 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -39,7 +39,9 @@ Layout::Layout(Catalogue &c, Driver *d):
        catalogue(c),
        driver(d),
        next_turnout_id(0x800)
-{ }
+{
+       clock.set_rate(60);
+}
 
 Layout::~Layout()
 {
@@ -343,13 +345,15 @@ void Layout::tick()
                dt = t-last_tick;
        last_tick = t;
 
+       clock.tick(dt);
+
        for(set<Sensor *>::iterator i=sensors.get().begin(); i!=sensors.get().end(); ++i)
                (*i)->tick(dt);
        const set<Signal *> &signals = objects.get<Signal>();
        for(set<Signal *>::iterator i=signals.begin(); i!=signals.end(); ++i)
                (*i)->tick(dt);
        for(map<unsigned, Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
-               i->second->tick(t, dt);
+               i->second->tick(dt);
 }
 
 void Layout::emergency(const string &msg)
@@ -431,10 +435,7 @@ void Layout::sensor_state_changed(Sensor &sensor, Sensor::State state)
 {
        if(state==Sensor::ACTIVE)
        {
-               Block *block = 0;
-               if(TrackCircuit *tc = dynamic_cast<TrackCircuit *>(&sensor))
-                       block = &tc->get_block();
-
+               Block *block = sensor.get_block();
                if(block && !block->get_train())
                        emergency(format("Unreserved sensor %d triggered", sensor.get_address()));
        }
@@ -499,17 +500,12 @@ Layout::Loader::Loader(Layout &l):
        new_tracks(false)
 {
        add("base",  &Layout::base);
-       add("route", static_cast<void (Loader::*)()>(&Loader::route));
+       add("route", &Loader::route);
        add("signal", &Loader::signal);
-       add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
-       add("train", static_cast<void (Loader::*)(ArticleNumber, unsigned, const std::string &)>(&Loader::train));
+       add("track", &Loader::track);
+       add("train", &Loader::train);
        add("turnout", &Loader::turnout);
        add("zone",  &Loader::zone);
-
-       // Deprecated aliases
-       add("route", static_cast<void (Loader::*)(const string &)>(&Loader::route));
-       add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
-       add("train", static_cast<void (Loader::*)(unsigned, unsigned, const std::string &)>(&Loader::train));
 }
 
 void Layout::Loader::route()
@@ -518,24 +514,12 @@ void Layout::Loader::route()
        load_sub(*rte);
 }
 
-void Layout::Loader::route(const string &n)
-{
-       Route *rte = new Route(obj);
-       rte->set_name(n);
-       load_sub(*rte);
-}
-
 void Layout::Loader::signal(ArticleNumber art_nr)
 {
        Signal *sig = new Signal(obj, obj.catalogue.get_signal(art_nr));
        load_sub(*sig);
 }
 
-void Layout::Loader::track(unsigned art_nr)
-{
-       track(ArticleNumber(art_nr));
-}
-
 void Layout::Loader::track(ArticleNumber art_nr)
 {
        Track *trk = new Track(obj, obj.catalogue.get_track(art_nr));
@@ -547,11 +531,6 @@ void Layout::Loader::track(ArticleNumber art_nr)
                        trk->link_to(**i);
 }
 
-void Layout::Loader::train(unsigned art_nr, unsigned addr, const std::string &proto)
-{
-       train(ArticleNumber(art_nr), addr, proto);
-}
-
 void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::string &proto)
 {
        Train *trn = new Train(obj, obj.catalogue.get_vehicle(art_nr), addr, proto);