Better sequence syncing on route change

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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 3d8b72246f2d02ce492b7c6672ba9a4ee5c1711a..542d1ffe8488c3e24d8b8beb2d976723d5075fc7 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -43,6 +43,7 @@ private:
        enum ArrivalState
        {
                ON_THE_WAY,
+               WAITING_FOR_SEQUENCE,
                RESERVED_TO_END,
                ARRIVED
        };
@@ -57,9 +58,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;
@@ -80,11 +80,12 @@ public:
        const Route *get_route() const;
        unsigned get_current_sequence() const { return current_sequence; }
 private:
+       void use_planned_route();
        void route_changed();
 
 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;
@@ -109,7 +110,9 @@ private:
        bool is_valid_for_track(const Route &, const TrackIter &) const;
        bool advance_to_track(RouteList::iterator &, const TrackIter &);
 
+       static void get_routers(Layout &, std::vector<TrainRouter *> &);
        static void start_planning(Layout &);
+       static void apply_plan(Layout &, TrainRoutePlanner &);
 };
 
 } // namespace R2C2