X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.h;h=f8fc8a0ed97346ca6a2eefc0c1f3f547088febd4;hb=59bae8acd679127602cf35d22bcd37e316a5a056;hp=67565a239af34d802a69f20be906090da0fb7fec;hpb=d0af7846e05691d65d8021e46c8f81e8ca05199a;p=r2c2.git

diff --git a/source/libr2c2/timetable.h b/source/libr2c2/timetable.h
index 67565a2..f8fc8a0 100644
--- a/source/libr2c2/timetable.h
+++ b/source/libr2c2/timetable.h
@@ -5,11 +5,12 @@
 #include <vector>
 #include <sigc++/trackable.h>
 #include <msp/datafile/objectloader.h>
-#include "block.h"
+#include "sensor.h"
 #include "trainai.h"
 
 namespace R2C2 {
 
+class Block;
 class Track;
 class Train;
 class Zone;
@@ -29,7 +30,6 @@ public:
 		void route(const std::string &);
 		void reverse();
 		void speed(unsigned);
-		void tag(const std::string &);
 		void travel_to(unsigned);
 		void travel_past(unsigned);
 		void wait(unsigned);
@@ -98,10 +98,10 @@ public:
 	void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private:
-	Track &get_sensor(unsigned);
+	Block &get_sensor(unsigned);
 	Track &get_turnout(unsigned);
 	Zone &get_zone(const std::string &);
-	void block_state_changed(Block &, Block::State);
+	void sensor_state_changed(Sensor &, Sensor::State);
 	void block_reserved(Block &, Train *);
 	void train_advanced(Block &);
 	void event(TrainAI &, const Message &);