X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.h;h=c0eb52e850006cd4ca48f41f1ad35dd77da227f3;hb=457e55c807755eae456633812ff3f3be888e97d5;hp=ece5b4bb6340351119fe162532a0fbb725198a45;hpb=59bae8acd679127602cf35d22bcd37e316a5a056;p=r2c2.git

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index ece5b4b..c0eb52e 100644
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -4,7 +4,7 @@
 #include <sigc++/signal.h>
 #include <sigc++/trackable.h>
 #include <msp/datafile/objectloader.h>
-#include <msp/time/timestamp.h>
+#include <msp/time/timedelta.h>
 #include "blockallocator.h"
 #include "controller.h"
 #include "sensor.h"
@@ -35,7 +35,6 @@ public:
 		void name(const std::string &);
 		void quantized_speed();
 		void router();
-		void timetable();
 		void vehicle(ArticleNumber);
 	};
 
@@ -61,11 +60,11 @@ private:
 	unsigned current_speed_step;
 	bool speed_changing;
 	bool reverse;
-	Msp::Time::TimeStamp stop_timeout;
+	Msp::Time::TimeDelta stop_timeout;
 	unsigned functions;
 
 	BlockIter last_entry_block;
-	Msp::Time::TimeStamp last_entry_time;
+	Msp::Time::TimeDelta travel_time;
 	bool pure_speed;
 	SpeedQuantizer *speed_quantizer;
 	bool accurate_position;
@@ -124,7 +123,7 @@ public:
 	const BlockAllocator &get_block_allocator() const { return allocator; }
 	float get_reserved_distance() const;
 
-	void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
+	void tick(const Msp::Time::TimeDelta &);
 
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private: