Use the TrackChain base class as destination in Router

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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 9938533cc86dfd36b03ffc3a4932626ac55d19a7..c518522590bc4fdda11cf330b8a5532ffc4d7d56 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -9,9 +9,8 @@ namespace R2C2 {
 
 class Block;
 class Layout;
-class Route;
 class Track;
-class Zone;
+class TrackChain;
 
 class TrainRouter: public TrainAI
 {
@@ -40,10 +39,10 @@ private:
 
        int priority;
        RouteList routes;
-       bool arriving;
-       const Zone *dest_zone;
-       const Block *dest_block;
+       unsigned arriving;
+       const TrackChain *destination;
        std::list<Wait> waits;
+       Msp::Time::TimeDelta delay;
 
        bool update_pending;
 
@@ -57,10 +56,11 @@ public:
        void add_wait(Block &, Train *);
        const Route *get_route() const;
 
-       void set_destination(const Zone &);
-       void set_destination(const Block &);
-       bool has_destination() const;
+       void set_destination(const TrackChain &);
+       const TrackChain *get_destination() const { return destination; }
        bool is_destination(Track &) const;
+       void set_departure_delay(const Msp::Time::TimeDelta &);
+       const Msp::Time::TimeDelta &get_departure_delay() const { return delay; }
 
        virtual void message(const Message &);
        virtual void tick(const Msp::Time::TimeDelta &);