]> git.tdb.fi Git - r2c2.git/blobdiff - source/libr2c2/trainrouter.h
Remove a function that was never used
[r2c2.git] / source / libr2c2 / trainrouter.h
index cbaa520cd20d945c5e1249ba5679fddb07c9b9b9..3c23496710a7b8e3b8df004ca40f1a988faf5e26 100644 (file)
@@ -37,6 +37,8 @@ public:
                unsigned sequence_out;
 
                SequencePoint(Block &, unsigned);
+
+               bool is_cleared() const;
        };
 
 private:
@@ -44,6 +46,7 @@ private:
 
        int priority;
        RouteList routes;
+       RouteList::iterator reserving_route;
        unsigned arriving;
        const TrackChain *destination;
        std::vector<const TrackChain *> waypoints;
@@ -51,8 +54,8 @@ private:
        std::vector<TrainRouteMetric *> metrics;
        bool metrics_stale;
        std::list<SequencePoint> sequence_points;
-       std::list<SequencePoint *> pending_sequence_checks;
        unsigned current_sequence;
+       bool sequence_check_pending;
        Msp::Time::TimeDelta delay;
        Msp::RefPtr<TrainRoutePlanner> planner;
 
@@ -88,12 +91,11 @@ public:
 private:
        void block_reserved(Block &, Train *);
        void train_advanced(Block &);
-       const Route *get_route_for_block(const Block &) const;
 
        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 &);
 };