X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=0ed2e118e7bb4e5ef503769f7ef3c765848752e2;hb=bb75bc76ddd99e7d3edaf6e7dbd3719ea332052c;hp=153eda0532dfc369d48f34aabc77fff068a3ec51;hpb=997e14793d8e58d3cb14a495970b36b1e0cad39b;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 153eda0..0ed2e11 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -32,7 +32,12 @@ private:
 	{
 		Train *train;
 		float speed;
+		Block *first_noncritical;
 		TrainRouter *router;
+		const TrackChain *destination;
+		std::vector<const TrackChain *> waypoints;
+		std::vector<const TrainRouteMetric *> metrics;
+		bool has_duration;
 		std::list<Route *> routes;
 		Track *track_history[2];
 		std::list<TrainRouter::SequencePoint> sequence;
@@ -65,12 +70,14 @@ private:
 	{
 		TrainRoutingInfo *info;
 		TrackIter track;
-		unsigned path;
+		unsigned char path;
+		bool critical;
 		OccupiedTrack *occupied_tracks;
 		float offset;
 		float back_offset;
 		TrainState state;
 		Msp::Time::TimeDelta delay;
+		Msp::Time::TimeDelta duration;
 		int waypoint;
 		float distance_traveled;
 		float remaining_estimate;
@@ -93,6 +100,7 @@ private:
 	struct RoutingStep
 	{
 		Msp::Time::TimeDelta time;
+		Msp::Time::TimeDelta penalty;
 		Msp::Time::TimeDelta cost_estimate;
 		std::vector<TrainRoutingState> trains;
 		const RoutingStep *prev;