X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=6706db6f4856755ab4a1e3a72e0140412a488c48;hb=b28062f2dc88e082ee5a28b2e1f7c4c8bd989023;hp=30b022f8597e12e8e539d6b247d8e38d92728b9c;hpb=af50f0bdecaf4d08cf13227d092a788c65220845;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 30b022f..6706db6 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -516,17 +516,17 @@ void Designer::update_track_icon(Track3D &track)
 	if(track.get_track().get_flex())
 		overlay->add_graphic(track, "flex");
 
-	if(unsigned sid = track.get_track().get_sensor_id())
+	if(unsigned saddr = track.get_track().get_sensor_address())
 	{
 		overlay->add_graphic(track, "sensor");
-		overlay->set_label(track, lexical_cast<string>(sid));
+		overlay->set_label(track, lexical_cast<string>(saddr));
 	}
-	else if(unsigned tid = track.get_track().get_turnout_id())
+	else if(unsigned taddr = track.get_track().get_turnout_address())
 	{
-		if(tid<0x800)
+		if(taddr<0x800)
 		{
 			overlay->add_graphic(track, "turnout");
-			overlay->set_label(track, lexical_cast<string>(tid));
+			overlay->set_label(track, lexical_cast<string>(taddr));
 		}
 	}
 }
@@ -566,10 +566,10 @@ string Designer::tooltip(int x, int y)
 		{
 			if(mode!=CATALOGUE && abs(track->get_tilt()).radians()>1e-4)
 				info += format(" (slope %.1f%%)", abs(tan(track->get_tilt())*100));
-			if(track->get_turnout_id())
-				info += format(" (turnout %d)", track->get_turnout_id());
-			else if(track->get_sensor_id())
-				info += format(" (sensor %d)", track->get_sensor_id());
+			if(track->get_turnout_address())
+				info += format(" (turnout %d)", track->get_turnout_address());
+			else if(track->get_sensor_address())
+				info += format(" (sensor %d)", track->get_sensor_address());
 		}
 		return info;
 	}
@@ -594,8 +594,8 @@ void Designer::show_route(const Route &route)
 		Track3D &t3d = layout_3d->get_3d(**i);
 		Path3D *path = new Path3D(t3d);
 		path->set_color(GL::Color(0.5, 0.8, 1.0));
-		if(unsigned tid = (*i)->get_turnout_id())
-			path->set_path(route.get_turnout(tid));
+		if(unsigned taddr = (*i)->get_turnout_address())
+			path->set_path(route.get_turnout(taddr));
 	}
 }