Maintain a separate list of pending RoutingStates

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

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index de88302d3f6c8e0a22d79fedd7edebf9580a32c0..7d1ff9a0709a61f4fdfe413687cf990790760caf 100644 (file)
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -25,7 +25,7 @@ private:
                float speed;
                TrainRouter *router;
                Route *route;
-               std::list<TrainRoutingState *> waits;
+               std::list<const TrainRoutingState *> waits;
 
                TrainRoutingInfo(Train &);
        };
@@ -69,7 +69,7 @@ private:
                ~TrainRoutingState();
 
                Msp::Time::TimeDelta get_time_to_next_track() const;
-               bool is_occupied(Track &) const;
+               bool is_occupying(Track &) const;
                bool check_arrival();
                void advance(float);
                void advance_track(unsigned);
@@ -79,12 +79,12 @@ private:
        {
                Msp::Time::TimeDelta time;
                std::vector<TrainRoutingState> trains;
-               RoutingStep *prev;
+               const RoutingStep *prev;
 
                RoutingStep();
-               RoutingStep(RoutingStep *);
+               RoutingStep(const RoutingStep *);
 
-               void create_successors(std::list<RoutingStep> &);
+               void create_successors(std::list<RoutingStep> &) const;
                bool update_states();
                bool check_deadlocks() const;
                int get_occupant(Track &) const;
@@ -98,14 +98,16 @@ private:
 
        std::vector<TrainRoutingInfo> routed_trains;
        std::list<RoutingStep> steps;
+       std::list<RoutingStep> queue;
 
 public:
        TrainRoutePlanner(Layout &);
 
        void plan();
 private:
-       void add_steps(RoutingStep &);
-       void create_routes(RoutingStep &);
+       const RoutingStep &get_step();
+       void add_steps(const RoutingStep &);
+       void create_routes(const RoutingStep &);
 };
 
 } // namespace R2C2