Store routing information in TrainRoutePlanner to avoid threading problems

[r2c2.git] / source / libr2c2 / trainrouteplanner.h

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 54ecadb8e905cd19138ef5070f11cd88b16da75e..fa97920e4d02730469ab1d5a190377891cf63126 100644 (file)
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -33,8 +33,12 @@ private:
                Train *train;
                float speed;
                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[3];
+               Track *track_history[2];
                std::list<TrainRouter::SequencePoint> sequence;
 
                TrainRoutingInfo(Train &);
@@ -71,6 +75,7 @@ private:
                float back_offset;
                TrainState state;
                Msp::Time::TimeDelta delay;
+               Msp::Time::TimeDelta duration;
                int waypoint;
                float distance_traveled;
                float remaining_estimate;