Convert Catalogue to a Collection

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

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 6725a23e8c547510fe65fa1c7442e5a80ec6d5e3..887b2d189f453dcc2dab13e59316f0642ce54df5 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -12,6 +12,7 @@
 namespace R2C2 {
 
 class ArticleNumber;
+class BeamGate;
 class Block;
 class Catalogue;
 class Driver;
@@ -29,16 +30,16 @@ class Layout
 public:
        class Loader: public Msp::DataFile::ObjectLoader<Layout>
        {
-       private:
-               bool new_tracks;
-
        public:
                Loader(Layout &);
        private:
+               void beamgate();
+               void clock();
                void route();
-               void signal(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;
@@ -89,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);
@@ -98,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 &);
@@ -106,6 +107,7 @@ public:
        void add(TrackChain &);
        void add(Block &);
        void add(Sensor &);
+       void add(BeamGate &);
 
        template<typename T>
        const std::set<T *> &get_all() const;
@@ -117,8 +119,9 @@ public:
        void remove(Track &);
        void remove(TrackChain &);
        void remove(Sensor &);
+       void remove(BeamGate &);
 
-       unsigned allocate_turnout_id();
+       unsigned allocate_turnout_address();
 
        Block &get_block(unsigned) const;
        void create_blocks();
@@ -136,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;