catalogue(c),
driver(d),
next_turnout_id(0x800)
-{ }
+{
+ clock.set_rate(60);
+}
Layout::~Layout()
{
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)
{
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()));
}
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()
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));
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);