Do not allocate blocks while halt is in effect

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

diff --git a/source/libr2c2/blockallocator.h b/source/libr2c2/blockallocator.h
index f5af90e585a4913554645cb189ee61d9fea32b17..2e3f3b28a7fb08d2ec809f35e2a75200651a1b8c 100644 (file)
--- 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;
 
@@ -48,7 +51,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(); }
@@ -80,6 +83,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;