X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=46a43a8353fffd8cccc266f418dbaa7bb117bcd3;hb=57e0944ee8ed442e2d0aa7c9964cac00450af5e7;hp=efc1e0f74cbc97627de661b40caa4cc09dd6ac8e;hpb=eb9c7f5200da4f3f31b41233be8cee397cb6abb9;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index efc1e0f..46a43a8 100644
--- 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)