Include block in the emergency signal

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

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 59eae083d05253b6d8c7d5a5e80ad0498d136c94..41de73d7dc11f9b46e3e209c318ff801a6c69851 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -34,8 +34,10 @@ public:
                Loader(Layout &);
        private:
                void beamgate();
+               void clock();
                void route();
                void signal(ArticleNumber);
+               void terrain(ArticleNumber);
                void track(ArticleNumber);
                void train(ArticleNumber, unsigned, const std::string &);
                void turnout(unsigned, unsigned);
@@ -76,7 +78,7 @@ public:
        sigc::signal<void, Train &> signal_train_removed;
        sigc::signal<void, Block &, Train *> signal_block_reserved;
        sigc::signal<void, Sensor &, Sensor::State> signal_sensor_state_changed;
-       sigc::signal<void, const std::string &> signal_emergency;
+       sigc::signal<void, Block *, const std::string &> signal_emergency;
 
 private:
        Catalogue &catalogue;
@@ -88,7 +90,7 @@ private:
        Storage<Sensor> sensors;
        std::map<unsigned, Train *> trains;
        Msp::Time::TimeStamp last_tick;
-       unsigned next_turnout_id;
+       unsigned next_turnout_addr;
 
 public:
        Layout(Catalogue &, Driver * = 0);
@@ -97,7 +99,7 @@ public:
        Catalogue &get_catalogue() const { return catalogue; }
        bool has_driver() const { return driver; }
        Driver &get_driver() const;
-       const Clock &get_clock() const { return clock; }
+       Clock &get_clock() { return clock; }
        const std::string &get_base() const { return base; }
 
        void add(Object &);
@@ -119,7 +121,7 @@ public:
        void remove(Sensor &);
        void remove(BeamGate &);
 
-       unsigned allocate_turnout_id();
+       unsigned allocate_turnout_address();
 
        Block &get_block(unsigned) const;
        void create_blocks();
@@ -137,7 +139,7 @@ public:
        void remove_train(Train &);
 
        void tick();
-       void emergency(const std::string &);
+       void emergency(Block *, const std::string &);
 
        void save(const std::string &) const;
        void save_dynamic(const std::string &) const;