X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.h;h=b401233593793a52743ef9bfb0967e4f27005197;hb=d0881a98a6240758ac1aeceaa9443d718ab1ad5c;hp=f5af90e585a4913554645cb189ee61d9fea32b17;hpb=c4daf1cc6b53cae34e46d4125a993ceed500de1a;p=r2c2.git

diff --git a/source/libr2c2/blockallocator.h b/source/libr2c2/blockallocator.h
index f5af90e..b401233 100644
--- a/source/libr2c2/blockallocator.h
+++ b/source/libr2c2/blockallocator.h
@@ -27,6 +27,9 @@ public:
 		void hint(unsigned);
 	};
 
+	sigc::signal<void, Block &, Sensor *> signal_advanced;
+	sigc::signal<void, Block &> signal_rear_advanced;
+
 private:
 	struct BlockMatch;
 
@@ -41,6 +44,7 @@ private:
 	const Block *stop_at_block;
 	bool reserving;
 	bool advancing;
+	bool reserve_pending;
 
 public:
 	BlockAllocator(Train &);
@@ -48,7 +52,7 @@ public:
 	void set_active(bool);
 	bool is_active() const { return active; }
 
-	void start_from(const BlockIter &);
+	bool start_from(const BlockIter &);
 	void rewind_to(const Block &);
 	void clear();
 	bool empty() const { return blocks.empty(); }
@@ -62,6 +66,8 @@ public:
 	bool has_block(const Block &) const;
 	bool is_block_current(const Block &) const;
 
+	void tick();
+
 private:
 	void reserve_more();
 	bool reserve_block(const BlockIter &);
@@ -80,6 +86,7 @@ private:
 	void block_reserved(Block &, const Train *);
 	void sensor_state_changed(Sensor &, Sensor::State);
 	void update_next_sensor(Sensor *);
+	void halt_event(bool);
 
 public:
 	void save(std::list<Msp::DataFile::Statement> &) const;