Unify destination and waypoints

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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 2b59603dff6b9e8ef2753c36917a3335931e64c7..80908d51b863ab63294f35df5dd994d197480ab2 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -57,9 +57,8 @@ private:
        RouteList routes;
        RouteList::iterator reserving_route;
        ArrivalState arrival;
-       const TrackChain *destination;
        std::vector<const TrackChain *> waypoints;
-       bool destination_changed;
+       bool waypoints_changed;
        std::vector<TrainRouteMetric *> metrics;
        bool metrics_stale;
        std::list<SequencePoint> sequence_points;
@@ -84,7 +83,7 @@ private:
 
 public:
        void set_destination(const TrackChain &);
-       const TrackChain *get_destination() const { return destination; }
+       const TrackChain *get_destination() const { return waypoints.empty() ? 0 : waypoints.back(); }
        void add_waypoint(const TrackChain &);
        unsigned get_n_waypoints() const { return waypoints.size(); }
        const TrackChain &get_waypoint(unsigned) const;
@@ -105,9 +104,9 @@ private:
        void train_rear_advanced(Block &);
 
        void create_metrics();
-       Route *create_lead_route(Route *, const Route *);
-       bool is_valid_for_track(const Route &, Track &) const;
-       bool advance_to_track(RouteList::iterator &, Track &);
+       bool create_lead_route();
+       bool is_valid_for_track(const Route &, const TrackIter &) const;
+       bool advance_to_track(RouteList::iterator &, const TrackIter &);
 
        static void start_planning(Layout &);
 };