Use signal_advanced for train speed measurement and vehicle placement

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

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index 16e67a43986776890b17734b54c9c15f91461478..3c4176d3e3cf6de5fe816e484b51205546a359bb 100644 (file)
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -35,6 +35,7 @@ public:
                void name(const std::string &);
                void quantized_speed();
                void router();
+               void timetable();
                void vehicle(ArticleNumber);
        };
 
@@ -97,6 +98,7 @@ public:
        float get_speed() const;
        float get_quantized_speed() const;
        unsigned get_speed_step() const { return current_speed_step; }
+       float get_maximum_speed() const;
        bool get_function(unsigned) const;
        unsigned get_functions() const { return functions; }
 
@@ -130,7 +132,7 @@ private:
        void control_changed(const Controller::Control &);
        void loco_speed_event(unsigned, unsigned, bool);
        void loco_func_event(unsigned, unsigned, bool);
-       void sensor_state_changed(Sensor &, Sensor::State);
+       void advanced(Block &, Sensor *);
        void halt_event(bool);
        void block_reserved(const Block &, const Train *);
        float get_reserved_distance_until(const Block *) const;