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 d24c3dc6a2ae54903bd4f6dd731861f9e000e110..7d1ff9a0709a61f4fdfe413687cf990790760caf 100644 (file)
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -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);
@@ -98,12 +98,14 @@ private:
 
        std::vector<TrainRoutingInfo> routed_trains;
        std::list<RoutingStep> steps;
+       std::list<RoutingStep> queue;
 
 public:
        TrainRoutePlanner(Layout &);
 
        void plan();
 private:
+       const RoutingStep &get_step();
        void add_steps(const RoutingStep &);
        void create_routes(const RoutingStep &);
 };