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

[r2c2.git] / source / libr2c2 / signal.cpp

diff --git a/source/libr2c2/signal.cpp b/source/libr2c2/signal.cpp
index 73563b6e815d1d6b7d3c8fd6ca957a4120ca8cca..72b35a737015f0d74349380cde8ac3a81c92b9bf 100644 (file)
--- a/source/libr2c2/signal.cpp
+++ b/source/libr2c2/signal.cpp
@@ -110,7 +110,7 @@ void Signal::tick(const Time::TimeDelta &)
                BlockIter iter = block.next();
                while(iter && iter->get_train()==train)
                {
-                       if(iter->get_sensor_id())
+                       if(iter->get_sensor_address())
                                ++n_blocks;
                        iter=iter.next();
                }
@@ -160,7 +160,7 @@ void Signal::train_advanced(Block &b)
 {
        if(&b==block.block())
                passing = true;
-       else if(passing && b.get_sensor_id())
+       else if(passing && b.get_sensor_address())
        {
                layout.get_driver().set_signal(address, type.get_indications().back().aspect);
                reset();