X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.h;h=2488f9371aa98c08a284daadc29bae40d976c05d;hb=1709c7afe41a96b079f3d34c9625d1a790dcc805;hp=5a0804fc77329b1c8714b3ce2d27112d1ff14b13;hpb=399b48a7a80dafde49e7530ff8dfd2820232a73f;p=r2c2.git

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 5a0804f..2488f93 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"
@@ -41,7 +42,8 @@ public:
 		void terrain(const std::string &);
 		void track(const std::string &);
 		void train(const std::string &, unsigned, const std::string &);
-		void turnout(unsigned, unsigned);
+		void turnout(unsigned);
+		void turnout2(unsigned, unsigned);
 		void zone();
 	};
 
@@ -150,6 +152,9 @@ public:
 	void remove_train(Train &);
 
 	void tick();
+private:
+	void step(const Msp::Time::TimeDelta &);
+public:
 	void emergency(Block *, const std::string &);
 
 	void save(const std::string &) const;