break;
}
- unsigned paths = lowest.track.endpoint().paths;
- for(unsigned i=0; paths>>i; ++i)
- if(paths&(1<<i))
+ const TrackType::Endpoint &ep = lowest.track.endpoint();
+ for(unsigned i=0; ep.paths>>i; ++i)
+ if(ep.has_path(i))
{
TrackIter next = lowest.track.next(i);
if(!next)
if(unsigned tid2 = links[j]->get_turnout_id())
{
- const TrackType::Endpoint &ep = links[j]->get_type().get_endpoint(links[j]->get_endpoint_by_link(**i));
+ const TrackType::Endpoint &ep = links[j]->get_type().get_endpoint(links[j]->get_link_slot(**i));
int p = get_turnout(tid2);
if(p>=0 && !ep.has_path(p))
{
if(unsigned tid = (*i)->get_turnout_id())
{
- const TrackType::Endpoint &ep = (*i)->get_type().get_endpoint((*i)->get_endpoint_by_link(trk));
+ const TrackType::Endpoint &ep = (*i)->get_type().get_endpoint((*i)->get_link_slot(trk));
int path = get_turnout(tid);
if(path>=0)
{
unsigned tid2 = tlinks[j]->get_turnout_id();
if(tid2)
{
- const TrackType::Endpoint &ep2 = tlinks[j]->get_type().get_endpoint(tlinks[j]->get_endpoint_by_link(**i));
+ const TrackType::Endpoint &ep2 = tlinks[j]->get_type().get_endpoint(tlinks[j]->get_link_slot(**i));
path = get_turnout(tid2);
// Ignore a linked turnout with some other path set
if(path>=0 && !ep2.has_path(path))
{
Track *link = (*i)->get_link(k);
if(!obj.tracks.count(link))
- obj.add_track_chain(*link, link->get_endpoint_by_link(**i), turnouts);
+ obj.add_track_chain(*link, link->get_link_slot(**i), turnouts);
if(!obj.tracks.count(*i))
obj.add_track_chain(**i, k, turnouts);
break;