X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=57d2de508cdc27be0dbc17c3953d24bc2d9c4c61;hb=1203771e5aa9b12dca147cd1a84ece9a01c0fccd;hp=a191cb6b117417fb288b8035ddd2bf03415fe017;hpb=f305e582aef0dceafd3b7b00bf9374bb69bdf8b0;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index a191cb6..57d2de5 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -63,7 +63,9 @@ private:
 		TrainState state;
 		Msp::Time::TimeDelta delay;
 		int waypoint;
+		float distance_traveled;
 		float remaining_estimate;
+		Msp::Time::TimeDelta wait_time;
 		int blocked_by;
 
 		TrainRoutingState(TrainRoutingInfo &);
@@ -74,6 +76,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();
 	};
@@ -81,7 +84,7 @@ private:
 	struct RoutingStep
 	{
 		Msp::Time::TimeDelta time;
-		Msp::Time::TimeDelta total_estimate;
+		Msp::Time::TimeDelta cost_estimate;
 		std::vector<TrainRoutingState> trains;
 		const RoutingStep *prev;