Rename turnout/sensor_id fields in Track and Block to *_addr

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

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index 7c61c4fdecf8ead4c767efc77ba564849a417f65..d1428cf70100070972a8758ee9ad0782e5d8b9fd 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,18 +30,13 @@ class Layout
 public:
        class Loader: public Msp::DataFile::ObjectLoader<Layout>
        {
-       private:
-               bool new_tracks;
-
        public:
                Loader(Layout &);
        private:
+               void beamgate();
                void route();
-               void route(const std::string &);
                void signal(ArticleNumber);
-               void track(unsigned);
                void track(ArticleNumber);
-               void train(unsigned, unsigned, const std::string &);
                void train(ArticleNumber, unsigned, const std::string &);
                void turnout(unsigned, unsigned);
                void zone();
@@ -92,7 +88,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);
@@ -109,6 +105,7 @@ public:
        void add(TrackChain &);
        void add(Block &);
        void add(Sensor &);
+       void add(BeamGate &);
 
        template<typename T>
        const std::set<T *> &get_all() const;
@@ -120,8 +117,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();