Keep better track of routes

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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 47a409cd7cb2bdb36064f753e5c2f9cadd4bca77..1c523d89e96fe1d2d1c7bb04fa9d4f141d95b76b 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -46,6 +46,7 @@ private:
 
        int priority;
        RouteList routes;
+       RouteList::iterator reserving_route;
        unsigned arriving;
        const TrackChain *destination;
        std::vector<const TrackChain *> waypoints;
@@ -94,8 +95,8 @@ private:
 
        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 &);
 };