Generate an event for reaching each waypoint

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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index c518522590bc4fdda11cf330b8a5532ffc4d7d56..4f620764fd8c1a679205f59bb49662ad0fc0d20a 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -24,7 +24,8 @@ public:
        };
 
        sigc::signal<void, const Route *> signal_route_changed;
-       sigc::signal<void> signal_arrived;
+       sigc::signal<void, const TrackChain *> signal_arrived;
+       sigc::signal<void, const TrackChain *> signal_waypoint_reached;
 
 private:
        struct Wait
@@ -41,6 +42,7 @@ private:
        RouteList routes;
        unsigned arriving;
        const TrackChain *destination;
+       std::vector<const TrackChain *> waypoints;
        std::list<Wait> waits;
        Msp::Time::TimeDelta delay;
 
@@ -59,6 +61,9 @@ public:
        void set_destination(const TrackChain &);
        const TrackChain *get_destination() const { return destination; }
        bool is_destination(Track &) const;
+       void add_waypoint(const TrackChain &);
+       unsigned get_n_waypoints() const { return waypoints.size(); }
+       bool is_waypoint(unsigned, Track &) const;
        void set_departure_delay(const Msp::Time::TimeDelta &);
        const Msp::Time::TimeDelta &get_departure_delay() const { return delay; }