X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=b56e93281f7ade4c183edc4b3be223e4c5fe2a60;hb=195ba0e08c597190481ac205afa05243c68fb39b;hp=80908d51b863ab63294f35df5dd994d197480ab2;hpb=100c7f252e145f095205c55a178ab57bb8da7e75;p=r2c2.git diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h index 80908d5..b56e932 100644 --- a/source/libr2c2/trainrouter.h +++ b/source/libr2c2/trainrouter.h @@ -43,7 +43,9 @@ private: enum ArrivalState { ON_THE_WAY, + WAITING_FOR_SEQUENCE, RESERVED_TO_END, + ADVANCED_TO_END, ARRIVED }; @@ -79,6 +81,7 @@ public: const Route *get_route() const; unsigned get_current_sequence() const { return current_sequence; } private: + void use_planned_route(); void route_changed(); public: @@ -108,7 +111,9 @@ private: bool is_valid_for_track(const Route &, const TrackIter &) const; bool advance_to_track(RouteList::iterator &, const TrackIter &); + static void get_routers(Layout &, std::vector &); static void start_planning(Layout &); + static void apply_plan(Layout &, TrainRoutePlanner &); }; } // namespace R2C2