]> git.tdb.fi Git - r2c2.git/blobdiff - source/libr2c2/train.h
Remove the scripting-based timetable
[r2c2.git] / source / libr2c2 / train.h
index 42bbc375b25b1346fc55b457b04cf41ca45dab22..e3eebe1fc5d050d2d3b2a230eaa332416c909a1f 100644 (file)
@@ -5,14 +5,15 @@
 #include <sigc++/trackable.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/time/timestamp.h>
-#include "block.h"
 #include "blockallocator.h"
 #include "controller.h"
+#include "sensor.h"
 #include "trainai.h"
 
 namespace R2C2 {
 
 class ArticleNumber;
+class Block;
 class SpeedQuantizer;
 class Vehicle;
 class VehicleType;
@@ -34,7 +35,6 @@ public:
                void name(const std::string &);
                void quantized_speed();
                void router();
-               void timetable();
                void vehicle(ArticleNumber);
        };
 
@@ -130,7 +130,7 @@ private:
        void control_changed(const Controller::Control &);
        void loco_speed_event(unsigned, unsigned, bool);
        void loco_func_event(unsigned, unsigned, bool);
-       void block_state_changed(Block &, Block::State);
+       void sensor_state_changed(Sensor &, Sensor::State);
        void halt_event(bool);
        void block_reserved(const Block &, const Train *);
        float get_reserved_distance_until(const Block *) const;