Convert Catalogue to a Collection

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

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index af06d4ba7eb017b81aaccd6343a8fd8206e01462..887b2d189f453dcc2dab13e59316f0642ce54df5 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -34,11 +34,12 @@ 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 signal(const std::string &);
+               void terrain(const std::string &);
+               void track(const std::string &);
+               void train(const std::string &, unsigned, const std::string &);
                void turnout(unsigned, unsigned);
                void zone();
        };
@@ -77,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;
@@ -138,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;