Allow direction to be specified for routing waypoints

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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 9fab2892efe15803da1f413277f7a6bd25678122..835ec484737761663da76d30eb97246d0a6178bd 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -3,6 +3,7 @@
 
 #include <list>
 #include <msp/datafile/objectloader.h>
+#include "trackchain.h"
 #include "trainai.h"
 
 namespace R2C2 {
@@ -10,7 +11,6 @@ namespace R2C2 {
 class Block;
 class Layout;
 class Track;
-class TrackChain;
 class TrainRouteMetric;
 class TrainRoutePlanner;
 
@@ -25,6 +25,14 @@ public:
                void route(const std::string &);
        };
 
+       struct Waypoint
+       {
+               const TrackChain *chain;
+               TrackChain::Direction direction;
+
+               Waypoint(const TrackChain &, TrackChain::Direction = TrackChain::UNSPECIFIED);
+       };
+
        struct SequencePoint
        {
                Block *block;
@@ -59,7 +67,7 @@ private:
        RouteList routes;
        RouteList::iterator reserving_route;
        ArrivalState arrival;
-       std::vector<const TrackChain *> waypoints;
+       std::vector<Waypoint> waypoints;
        bool waypoints_changed;
        std::vector<TrainRouteMetric *> metrics;
        bool metrics_stale;
@@ -86,10 +94,10 @@ private:
 
 public:
        void set_destination(const TrackChain &);
-       const TrackChain *get_destination() const { return waypoints.empty() ? 0 : waypoints.back(); }
-       void add_waypoint(const TrackChain &);
+       const TrackChain *get_destination() const { return waypoints.empty() ? 0 : waypoints.back().chain; }
+       void add_waypoint(const TrackChain &, TrackChain::Direction = TrackChain::UNSPECIFIED);
        unsigned get_n_waypoints() const { return waypoints.size(); }
-       const TrackChain &get_waypoint(unsigned) const;
+       const Waypoint &get_waypoint(unsigned) const;
        const TrainRouteMetric &get_metric(int = -1) const;
        void set_departure_delay(const Msp::Time::TimeDelta &);
        const Msp::Time::TimeDelta &get_departure_delay() const { return delay; }