Make sure Block::signal_reserved is emitted consistently

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

diff --git a/source/libr2c2/block.h b/source/libr2c2/block.h
index 2f898b0992af7e14799fc576532265f8b808bff8..6823b2730343faa69c03b14b0f507701ad26b85d 100644 (file)
--- a/source/libr2c2/block.h
+++ b/source/libr2c2/block.h
@@ -38,11 +38,15 @@ private:
        TrackCircuit *sensor;
        std::vector<Endpoint> endpoints;
        Train *train;
+       Train *pending_train;
+       bool emitting_reserve;
 
 public:
        Block(Layout &, Track &);
        ~Block();
 
+       virtual void set_name(const std::string &);
+
 private:
        virtual void on_track_added(Track &);
        virtual Validity check_validity(Track &) const;
@@ -63,6 +67,9 @@ public:
        Train *get_train() const { return train; }
 private:
        void determine_id();
+
+public:
+       virtual Msp::DataFile::Statement save_reference() const;
 };
 
 } // namespace R2C2