X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=866454164ee1592b9cb794f8413cc9509c3571a5;hb=a4566a4a23ff676f11a90615e8e468ef50107946;hp=4289d3c0dd9b5b77e13224b8c8a01eb616771def;hpb=9ddcd066e37e4c72685817c042c30897786ece05;p=r2c2.git diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h index 4289d3c..8664541 100644 --- 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 signal_name_changed; @@ -73,6 +76,7 @@ private: std::list 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 real_speed; + bool accurate_position; + float overshoot_dist; public: Train(Layout &, const LocoType &, unsigned);