X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.h;h=17a418ebab2b7c4da358a7a0e5fd78623b67936a;hb=3dd660ffad729fbd6e75e6401f5c7f27b9013faf;hp=b67e5fb3c2baa4761b639dae6a55e3902795e014;hpb=9ad36841021cdd5c7f14d52e946d8ecdb602cf78;p=r2c2.git

diff --git a/source/libr2c2/timetable.h b/source/libr2c2/timetable.h
index b67e5fb..17a418e 100644
--- a/source/libr2c2/timetable.h
+++ b/source/libr2c2/timetable.h
@@ -2,12 +2,12 @@
 #define LIBR2C2_TIMETABLE_H_
 
 #include <msp/datafile/objectloader.h>
+#include "trackchain.h"
 #include "trainai.h"
 
 namespace R2C2 {
 
 class Layout;
-class Zone;
 
 class Timetable: public TrainAI
 {
@@ -27,7 +27,8 @@ public:
 	enum RowType
 	{
 		ARRIVE = 1,
-		DEPART
+		DEPART,
+		THROUGH
 	};
 
 	struct Row
@@ -41,12 +42,14 @@ public:
 			Loader(Row &, Layout &);
 
 		private:
-			void zone(const std::string &, unsigned);
+			void block(unsigned);
 			void time(Msp::Time::RawTime);
+			void zone(const std::string &, unsigned);
 		};
 
 		RowType type;
-		Zone *zone;
+		TrackChain *target;
+		TrackChain::Direction direction;
 		Msp::Time::TimeDelta time;
 
 		Row();
@@ -54,6 +57,15 @@ public:
 		void save(std::list<Msp::DataFile::Statement> &) const;
 	};
 
+	struct RowTypeMatch
+	{
+		RowType type;
+
+		RowTypeMatch(RowType t): type(t) { }
+
+		bool operator()(const Row &r) const { return r.type==type; }
+	};
+
 	sigc::signal<void, unsigned, const Row &> signal_row_added;
 	sigc::signal<void, unsigned, const Row &> signal_row_modified;
 	sigc::signal<void, unsigned> signal_row_removed;
@@ -62,6 +74,7 @@ private:
 	std::list<Row> rows;
 	std::list<Row>::iterator current_row;
 	bool update_pending;
+	bool sync_to_clock;
 
 public:
 	Timetable(Train &);
@@ -79,9 +92,11 @@ public:
 	void save(std::list<Msp::DataFile::Statement> &) const;
 
 private:
-	void check_update(std::list<Row>::const_iterator);
+	void check_update(const std::list<Row>::const_iterator &);
+	std::list<Row>::iterator find_trip(const std::list<Row>::iterator &, std::list<Row>::iterator *);
 	void update_route();
 	void event(TrainAI &, const Message &);
+	void record_time();
 };
 
 } // namespace R2C2