X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=87e3dda10003c7fd917dec1a94b619f2911ffb93;hb=190829464f446f211e4aff058bb555519a65c6ee;hp=c88bae8e24648cd09f8566d09c1dbf3ddbcb2607;hpb=5a02a4f42dfc5dc6b4daef5fc02431bdfb2968d8;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index c88bae8..87e3dda 100644
--- 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))