Keep routes until the train has completely left them

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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 47a409cd7cb2bdb36064f753e5c2f9cadd4bca77..4f51b3e107878b07e37cd86fa38d7509d8527208 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -25,10 +25,6 @@ public:
                void route(const std::string &);
        };
 
-       sigc::signal<void, const Route *> signal_route_changed;
-       sigc::signal<void, const TrackChain *> signal_arrived;
-       sigc::signal<void, const TrackChain *> signal_waypoint_reached;
-
        struct SequencePoint
        {
                Block *block;
@@ -44,9 +40,23 @@ public:
 private:
        typedef std::list<const Route *> RouteList;
 
+       enum ArrivalState
+       {
+               ON_THE_WAY,
+               RESERVED_TO_END,
+               ARRIVED
+       };
+
+public:
+       sigc::signal<void, const Route *> signal_route_changed;
+       sigc::signal<void, const TrackChain *> signal_arrived;
+       sigc::signal<void, const TrackChain *> signal_waypoint_reached;
+
+private:
        int priority;
        RouteList routes;
-       unsigned arriving;
+       RouteList::iterator reserving_route;
+       ArrivalState arrival;
        const TrackChain *destination;
        std::vector<const TrackChain *> waypoints;
        bool destination_changed;
@@ -90,12 +100,12 @@ public:
 private:
        void block_reserved(Block &, Train *);
        void train_advanced(Block &);
-       const Route *get_route_for_block(const Block &) const;
+       void train_rear_advanced(Block &);
 
        void create_metrics();
        Route *create_lead_route(Route *, const Route *);
-       bool advance_route(RouteList::iterator &, const Block &);
-       bool is_on_route(const Block &);
+       bool is_valid_for_track(const Route &, Track &) const;
+       bool advance_to_track(RouteList::iterator &, Track &);
 
        static void start_planning(Layout &);
 };