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 59eae083d05253b6d8c7d5a5e80ad0498d136c94..d1428cf70100070972a8758ee9ad0782e5d8b9fd 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -88,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);
@@ -119,7 +119,7 @@ public:
        void remove(Sensor &);
        void remove(BeamGate &);
 
-       unsigned allocate_turnout_id();
+       unsigned allocate_turnout_address();
 
        Block &get_block(unsigned) const;
        void create_blocks();