Use different stopping margin depending on whether the next track is a turnout

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

diff --git a/source/libr2c2/timetable.h b/source/libr2c2/timetable.h
index 86b4ae2944c8e21ebb207d49e27e54a946d62dbf..8f64ad1c1f1ec828c81f4a7691aff1cf40b6bbee 100644 (file)
--- a/source/libr2c2/timetable.h
+++ b/source/libr2c2/timetable.h
@@ -36,9 +36,10 @@ public:
                void route(const std::string &);
                void reverse();
                void speed(unsigned);
-               void travel(const std::string &);
+               void travel(unsigned);
                void wait(unsigned);
                void wait_train(unsigned, unsigned);
+               void wait_until(unsigned, unsigned);
        };
 
        enum RowType
@@ -47,6 +48,7 @@ public:
                GOTO_ZONE,
                TRAVEL,
                WAIT_TIME,
+               WAIT_UNTIL,
                WAIT_TRAIN,
                ARRIVE,
                SPEED,
@@ -83,6 +85,7 @@ private:
        Block *pending_block;
        Train *pending_train;
        Msp::Time::TimeStamp wait_timeout;
+       bool arrived;
 
 public:
        Timetable(Train &);