X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Ftimetable.h;h=cbbb49b3d9e3d357fa9e24780f834c752ee69123;hb=598631d530a20ba8f4710f45747a9742e149f604;hp=8f64ad1c1f1ec828c81f4a7691aff1cf40b6bbee;hpb=dbaa67c30705a9993d2626cec588c7320f1eef17;p=r2c2.git

diff --git a/source/libr2c2/timetable.h b/source/libr2c2/timetable.h
index 8f64ad1..cbbb49b 100644
--- a/source/libr2c2/timetable.h
+++ b/source/libr2c2/timetable.h
@@ -31,12 +31,13 @@ public:
 	private:
 		void arrive();
 		void goto_sensor(unsigned);
-		void goto_sensor(const std::string &);
+		void goto_sensor_str(const std::string &);
 		void goto_zone(const std::string &);
 		void route(const std::string &);
 		void reverse();
 		void speed(unsigned);
-		void travel(unsigned);
+		void travel_to(unsigned);
+		void travel_past(unsigned);
 		void wait(unsigned);
 		void wait_train(unsigned, unsigned);
 		void wait_until(unsigned, unsigned);
@@ -46,7 +47,8 @@ public:
 	{
 		GOTO_SENSOR,
 		GOTO_ZONE,
-		TRAVEL,
+		TRAVEL_TO,
+		TRAVEL_PAST,
 		WAIT_TIME,
 		WAIT_UNTIL,
 		WAIT_TRAIN,
@@ -104,8 +106,11 @@ public:
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private:
 	Track &get_sensor(unsigned);
+	Track &get_turnout(unsigned);
 	Zone &get_zone(const std::string &);
 	void sensor_event(unsigned, bool);
+	void block_reserved(Block &, Train *);
+	void train_advanced(Block &);
 	void train_arrived();
 };