X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=e06d4fb04f50d8ccb1e581a363e2dce18d13d91a;hb=065d35f5f86a5b9cda95736f59e63845e0bb6fa6;hp=a1c37d312b682ed6fabb086018824a0876d54d2e;hpb=08dea8dfcf923e9296bcd3910455540895d0439b;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index a1c37d3..e06d4fb 100644
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -5,6 +5,7 @@
 #include <set>
 #include <sigc++/sigc++.h>
 #include <msp/datafile/objectloader.h>
+#include <msp/time/timedelta.h>
 #include <msp/time/timestamp.h>
 #include "geometry.h"
 #include "sensor.h"
@@ -71,7 +72,7 @@ private:
 
 	struct BlockReservation
 	{
-		Block &block;
+		Block *block;
 		Train *train;
 
 		BlockReservation(Block &, Train *);
@@ -150,7 +151,10 @@ public:
 	const std::map<unsigned, Train *> &get_trains() const { return trains; }
 	void remove_train(Train &);
 
-	void tick();
+	void tick(float = 1.0f);
+private:
+	void step(const Msp::Time::TimeDelta &);
+public:
 	void emergency(Block *, const std::string &);
 
 	void save(const std::string &) const;