overlay->add_graphic(obj3d, "trackcircuit");
overlay->set_label(obj3d, lexical_cast<string>(saddr));
}
- else if(unsigned taddr = track->get_turnout_address())
+ else if(track->get_type().is_turnout())
{
+ unsigned taddr = track->get_turnout_address();
if(taddr<0x800)
{
overlay->add_graphic(obj3d, "turnout");
{
if(mode!=CATALOGUE && abs(track->get_tilt()).radians()>1e-4)
info += format(" (slope %.1f%%)", abs(tan(track->get_tilt())*100));
- if(track->get_turnout_address())
+ if(track->get_type().is_turnout())
info += format(" (turnout %d)", track->get_turnout_address());
else if(track->get_sensor_address())
info += format(" (sensor %d)", track->get_sensor_address());
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 taddr = (*i)->get_turnout_address())
- path->set_path(route.get_turnout(taddr));
+ if((*i)->get_type().is_turnout())
+ path->set_path(route.get_turnout((*i)->get_turnout_address()));
highlight_paths.push_back(path);
}
}