Cosmetic fixes

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

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 54ecadb8e905cd19138ef5070f11cd88b16da75e..34dcce69daeddb8a5f8d20255497eca8a453fcef 100644 (file)
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -32,9 +32,14 @@ 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[3];
+               Track *track_history[2];
                std::list<TrainRouter::SequencePoint> sequence;
 
                TrainRoutingInfo(Train &);
@@ -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;
@@ -139,7 +147,7 @@ public:
        Result plan();
        void plan_async();
        Result check();
-       Result get_result() { return result; }
+       Result get_result() const { return result; }
        const std::list<Route *> &get_routes_for(const Train &) const;
        const std::list<TrainRouter::SequencePoint> &get_sequence_for(const Train &) const;
 private: