X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.h;h=67e5ad4ecb8d8684006bf5a1a31d15eaf6711424;hb=9a7097fed866060efb8738f8b2f17d5c96a6c980;hp=da16d3c0d488c23cffc7d3879fcf2c367e611141;hpb=a34347c6642d89a44960aeddc372891744cded15;p=r2c2.git

diff --git a/source/libr2c2/timetable.h b/source/libr2c2/timetable.h
index da16d3c..67e5ad4 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 TrackChain;
 
 class Timetable: public TrainAI
 {
@@ -44,11 +44,13 @@ public:
 		private:
 			void block(unsigned);
 			void time(Msp::Time::RawTime);
-			void zone(const std::string &, unsigned);
+			void zone(const std::string &);
+			void zone_numbered(const std::string &, unsigned);
 		};
 
 		RowType type;
 		TrackChain *target;
+		TrackChain::Direction direction;
 		Msp::Time::TimeDelta time;
 
 		Row();
@@ -56,6 +58,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;
@@ -64,6 +75,9 @@ private:
 	std::list<Row> rows;
 	std::list<Row>::iterator current_row;
 	bool update_pending;
+	bool sync_to_clock;
+	bool late_arrival;
+	std::list<Row>::iterator next_depart;
 
 public:
 	Timetable(Train &);
@@ -77,14 +91,19 @@ public:
 	const Row &get_row(unsigned) const;
 
 	virtual void tick(const Msp::Time::TimeDelta &);
+private:
+	bool passed_row(const Row &, const Msp::Time::TimeDelta &) const;
 
+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();
+	void clock_discontinuity();
 };
 
 } // namespace R2C2