Remove diversion logic

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

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index e16f726c5bebf78bbb56b091c82f11739cca1108..709140c9a6102e3dcb61a94ffc130894dfb10baf 100644 (file)
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -51,14 +51,6 @@ public:
        sigc::signal<void, const std::string &> signal_status_changed;
 
 private:
-       struct RouteRef
-       {
-               const Route *route;
-               unsigned diversion;
-
-               RouteRef(const Route *, unsigned = 0);
-       };
-
        typedef std::list<BlockIter> BlockList;
 
        Layout &layout;
@@ -84,7 +76,7 @@ private:
        bool reverse;
        Msp::Time::TimeStamp stop_timeout;
        unsigned functions;
-       std::list<RouteRef> routes;
+       std::list<const Route *> routes;
        bool end_of_route;
 
        Msp::Time::TimeStamp last_entry_time;
@@ -135,7 +127,6 @@ public:
        bool set_route(const Route *);
        bool go_to(Track &);
        bool go_to(const Zone &);
-       bool divert(Track &);
        const Route *get_route() const;
        void place(Block &, unsigned);
        void unplace();
@@ -162,9 +153,8 @@ private:
        void release_blocks();
        void release_blocks(BlockList::iterator, BlockList::iterator);
        void reverse_blocks(BlockList &) const;
-       bool advance_route(std::list<RouteRef>::iterator &, Track &);
+       bool advance_route(std::list<const Route *>::iterator &, Track &);
        Route *create_lead_route(Route *, const Route *);
-       bool is_valid_diversion(const Route &, const TrackIter &);
 };
 
 } // namespace R2C2