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;
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);
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
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)
{
{
Block *block = sensor.get_block();
if(block && !block->get_train())
- emergency(format("Unreserved sensor %d triggered", sensor.get_address()));
+ emergency(block, "Unreserved sensor triggered");
}
}