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

diff --git a/source/libr2c2/timetable.h b/source/libr2c2/timetable.h
index 86b4ae2..8f64ad1 100644
--- a/source/libr2c2/timetable.h
+++ b/source/libr2c2/timetable.h
@@ -36,9 +36,10 @@ public:
 		void route(const std::string &);
 		void reverse();
 		void speed(unsigned);
-		void travel(const std::string &);
+		void travel(unsigned);
 		void wait(unsigned);
 		void wait_train(unsigned, unsigned);
+		void wait_until(unsigned, unsigned);
 	};
 
 	enum RowType
@@ -47,6 +48,7 @@ public:
 		GOTO_ZONE,
 		TRAVEL,
 		WAIT_TIME,
+		WAIT_UNTIL,
 		WAIT_TRAIN,
 		ARRIVE,
 		SPEED,
@@ -83,6 +85,7 @@ private:
 	Block *pending_block;
 	Train *pending_train;
 	Msp::Time::TimeStamp wait_timeout;
+	bool arrived;
 
 public:
 	Timetable(Train &);