Replace waits with a more robust sequencing system

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

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 57d2de508cdc27be0dbc17c3953d24bc2d9c4c61..c6ca741555282c767bf7247e76c6fa49407aabb3 100644 (file)
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -18,6 +18,17 @@ class TrainRoutePlanner
 {
 private:
        struct TrainRoutingState;
+       struct TrainRoutingInfo;
+
+       struct SequencingInfo
+       {
+               Track *track;
+               TrainRoutingInfo *preceding;
+               unsigned sequence_in;
+               unsigned sequence_out;
+
+               SequencingInfo(Track *, unsigned);
+       };
 
        struct TrainRoutingInfo
        {
@@ -26,7 +37,7 @@ private:
                TrainRouter *router;
                std::list<Route *> routes;
                Track *track_history[3];
-               std::list<const TrainRoutingState *> waits;
+               std::list<SequencingInfo> sequence;
 
                TrainRoutingInfo(Train &);
        };