Halt all trains in various unexpected situations

[r2c2.git] / source / libmarklin / train.h

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 4289d3c0dd9b5b77e13224b8c8a01eb616771def..866454164ee1592b9cb794f8413cc9509c3571a5 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -18,6 +18,7 @@ namespace Marklin {
 class ControlModel;
 class LocoType;
 class Route;
+class Timetable;
 class Vehicle;
 
 class Train: public sigc::trackable
@@ -36,6 +37,8 @@ public:
                void name(const std::string &);
                void real_speed(unsigned, float, float);
                void route(const std::string &);
+               void timetable();
+               void vehicle(unsigned);
        };
 
        sigc::signal<void, const std::string &> signal_name_changed;
@@ -73,6 +76,7 @@ private:
        std::list<BlockRef> rsv_blocks;
        Block *pending_block;
        ControlModel *control;
+       Timetable *timetable;
        bool active;
        unsigned current_speed;
        bool speed_changing;
@@ -88,6 +92,8 @@ private:
        float travel_dist;
        bool pure_speed;
        std::vector<RealSpeed> real_speed;
+       bool accurate_position;
+       float overshoot_dist;
 
 public:
        Train(Layout &, const LocoType &, unsigned);