Move duplicated successor step creation code to a function

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

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index c7572c0df41cb48c548fa2c4b0cb40f6afdd4453..3076c3978efa5ed0b27edae5cec7b4130e72afa7 100644 (file)
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -34,7 +34,7 @@ private:
                float speed;
                Block *first_noncritical;
                TrainRouter *router;
-               std::vector<const TrackChain *> waypoints;
+               std::vector<TrainRouter::Waypoint> waypoints;
                std::vector<const TrainRouteMetric *> metrics;
                bool has_duration;
                std::list<Route *> routes;
@@ -109,6 +109,7 @@ private:
                RoutingStep(const RoutingStep *);
 
                void create_successors(std::list<RoutingStep> &) const;
+               static void create_successor(RoutingStep &, unsigned, unsigned, std::list<RoutingStep> &);
                bool update_states();
                bool check_deadlocks() const;
                int get_occupant(Track &) const;