Do not tick the clock while halted

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

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 0025ec3b5b3adcd305ebd08ec8b8a9c44b8622ac..43ce921475cf9971b3ff518f48cf6d5425aedf14 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -188,12 +188,21 @@ template<typename T>
 T *Layout::pick(const Ray &ray)
 {
        const set<Object *> &objs = objects.get();
+       T *closest = 0;
+       float distance = -1;
        for(set<Object *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
                if(T *t = dynamic_cast<T *>(*i))
-                       if(t->collide_ray(ray))
-                               return t;
+               {
+                       float d = -1;
+                       if(t->collide_ray(ray, &d))
+                               if(!closest || d<distance)
+                               {
+                                       closest = t;
+                                       distance = d;
+                               }
+               }
 
-       return 0;
+       return closest;
 }
 
 template Object *Layout::pick<Object>(const Ray &);
@@ -239,7 +248,7 @@ unsigned Layout::allocate_turnout_address()
        set<unsigned> used_addrs;
        const set<Track *> &tracks = objects.get<Track>();
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               if((*i)->get_turnout_address())
+               if((*i)->get_type().is_turnout())
                        used_addrs.insert((*i)->get_turnout_address());
 
        unsigned result = next_turnout_addr;
@@ -376,7 +385,8 @@ void Layout::tick()
                dt = t-last_tick;
        last_tick = t;
 
-       clock.tick(dt);
+       if(!driver || !driver->is_halted())
+               clock.tick(dt);
 
        for(set<Sensor *>::iterator i=sensors.get().begin(); i!=sensors.get().end(); ++i)
                (*i)->tick(dt);
@@ -387,12 +397,15 @@ void Layout::tick()
                i->second->tick(dt);
 }
 
-void Layout::emergency(const string &msg)
+void Layout::emergency(Block *block, const string &msg)
 {
        if(driver)
                driver->halt(true);
-       IO::print("Emergency: %s\n", msg);
-       signal_emergency.emit(msg);
+       if(block)
+               IO::print("Emergency at %s: %s\n", block->get_name(), msg);
+       else
+               IO::print("Emergency: %s\n", msg);
+       signal_emergency.emit(block, msg);
 }
 
 void Layout::save(const string &fn) const
@@ -463,10 +476,16 @@ void Layout::save_dynamic(const string &fn) const
        IO::BufferedFile out(fn, IO::M_WRITE);
        DataFile::Writer writer(out);
 
+       {
+               DataFile::Statement st("clock");
+               clock.save(st.sub);
+               writer.write(st);
+       }
+
        const set<Track *> &tracks = objects.get<Track>();
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               if(unsigned taddr = (*i)->get_turnout_address())
-                       writer.write((DataFile::Statement("turnout"), taddr, (*i)->get_active_path()));
+               if((*i)->get_type().is_turnout())
+                       writer.write((DataFile::Statement("turnout"), (*i)->get_turnout_address(), (*i)->get_active_path()));
 
        for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
        {
@@ -485,7 +504,7 @@ void Layout::sensor_state_changed(Sensor &sensor, Sensor::State state)
        {
                Block *block = sensor.get_block();
                if(block && !block->get_train())
-                       emergency(format("Unreserved sensor %d triggered", sensor.get_address()));
+                       emergency(block, "Unreserved sensor triggered");
        }
 }
 
@@ -548,6 +567,7 @@ Layout::Loader::Loader(Layout &l):
 {
        add("base",  &Layout::base);
        add("beamgate", &Loader::beamgate);
+       add("clock", &Loader::clock);
        add("route", &Loader::route);
        add("signal", &Loader::signal);
        add("terrain", &Loader::terrain);
@@ -563,6 +583,11 @@ void Layout::Loader::beamgate()
        load_sub(*gate);
 }
 
+void Layout::Loader::clock()
+{
+       load_sub(obj.clock);
+}
+
 void Layout::Loader::route()
 {
        Route *rte = new Route(obj);