X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=33e6ef5f1b4c5c7f22e23432eb3ed87932191e0c;hb=c52c0e591be55cb2c7251689c69c642e3cb3601c;hp=215cbfd6c9b1660356c375d1d1bb6aa471f8b4d3;hpb=d578d036656c0e89fe9dca5aefd1f81d2777a69e;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 215cbfd..33e6ef5 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -24,7 +24,8 @@ private:
 		Train *train;
 		float speed;
 		TrainRouter *router;
-		Route *route;
+		std::list<Route *> routes;
+		Track *track_history[3];
 		std::list<const TrainRoutingState *> waits;
 
 		TrainRoutingInfo(Train &);
@@ -62,7 +63,7 @@ private:
 		TrainState state;
 		Msp::Time::TimeDelta delay;
 		int waypoint;
-		Msp::Time::TimeDelta remaining_estimate;
+		float remaining_estimate;
 		int blocked_by;
 
 		TrainRoutingState(TrainRoutingInfo &);
@@ -73,6 +74,7 @@ private:
 		bool is_occupying(Track &) const;
 		bool check_arrival();
 		void advance(float);
+		void advance(const Msp::Time::TimeDelta &);
 		void advance_track(unsigned);
 		void update_estimate();
 	};