X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.h;h=cbbb49b3d9e3d357fa9e24780f834c752ee69123;hb=d084e6f369a829f41086d1f7f9befa52d0392d58;hp=9cfda68df5df05a2876e920169efafe6debf85fd;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/libr2c2/timetable.h b/source/libr2c2/timetable.h
index 9cfda68..cbbb49b 100644
--- a/source/libr2c2/timetable.h
+++ b/source/libr2c2/timetable.h
@@ -17,7 +17,9 @@ Distributed under the GPL
 namespace R2C2 {
 
 class Block;
+class Track;
 class Train;
+class Zone;
 
 class Timetable: public sigc::trackable
 {
@@ -28,20 +30,27 @@ public:
 		Loader(Timetable &);
 	private:
 		void arrive();
-		void go_to(const std::string &);
+		void goto_sensor(unsigned);
+		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(const std::string &);
+		void travel_to(unsigned);
+		void travel_past(unsigned);
 		void wait(unsigned);
-		void wait_train(unsigned, const std::string &);
+		void wait_train(unsigned, unsigned);
+		void wait_until(unsigned, unsigned);
 	};
 
 	enum RowType
 	{
-		GOTO,
-		TRAVEL,
+		GOTO_SENSOR,
+		GOTO_ZONE,
+		TRAVEL_TO,
+		TRAVEL_PAST,
 		WAIT_TIME,
+		WAIT_UNTIL,
 		WAIT_TRAIN,
 		ARRIVE,
 		SPEED,
@@ -78,6 +87,7 @@ private:
 	Block *pending_block;
 	Train *pending_train;
 	Msp::Time::TimeStamp wait_timeout;
+	bool arrived;
 
 public:
 	Timetable(Train &);
@@ -95,8 +105,12 @@ public:
 	void tick(const Msp::Time::TimeStamp &);
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private:
-	Block &parse_location(const std::string &);
+	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();
 };