]> git.tdb.fi Git - r2c2.git/blobdiff - source/libr2c2/trainrouteplanner.h
Unify destination and waypoints
[r2c2.git] / source / libr2c2 / trainrouteplanner.h
index 34dcce69daeddb8a5f8d20255497eca8a453fcef..b76d663ab5f8caea318ec2bf612bc1d4ab9d83c4 100644 (file)
@@ -34,7 +34,6 @@ private:
                float speed;
                Block *first_noncritical;
                TrainRouter *router;
-               const TrackChain *destination;
                std::vector<const TrackChain *> waypoints;
                std::vector<const TrainRouteMetric *> metrics;
                bool has_duration;
@@ -78,7 +77,7 @@ private:
                TrainState state;
                Msp::Time::TimeDelta delay;
                Msp::Time::TimeDelta duration;
-               int waypoint;
+               unsigned waypoint;
                float distance_traveled;
                float remaining_estimate;
                Msp::Time::TimeDelta wait_time;