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

[r2c2.git] / source / engineer / engineer.cpp

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index c88bae8e24648cd09f8566d09c1dbf3ddbcb2607..87e3dda10003c7fd917dec1a94b619f2911ffb93 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -193,7 +193,7 @@ void Engineer::button_press(unsigned btn)
                Object *obj = pick_object(pointer);
                if(Track *track = dynamic_cast<Track *>(obj))
                {
-                       if(track->get_turnout_id())
+                       if(track->get_turnout_address())
                        {
                                Block &block = track->get_block();
                                if(block.get_train() && block.get_train()->is_block_critical(block))
@@ -210,14 +210,14 @@ void Engineer::button_press(unsigned btn)
                                                        ++i;
                                        }
                                        track->set_active_path(i);
-                                       set_status(format("Turnout %d", track->get_turnout_id()));
+                                       set_status(format("Turnout %d", track->get_turnout_address()));
                                }
                        }
-                       if(unsigned sid = track->get_sensor_id())
+                       if(unsigned saddr = track->get_sensor_address())
                        {
                                if(options.simulate)
-                                       layout.get_driver().set_sensor(sid, !layout.get_driver().get_sensor(sid));
-                               set_status(format("Sensor %d", sid));
+                                       layout.get_driver().set_sensor(saddr, !layout.get_driver().get_sensor(saddr));
+                               set_status(format("Sensor %d", saddr));
                        }
                }
                else if(Vehicle *veh = dynamic_cast<Vehicle *>(obj))