return;
}
- TrackIter next_track = train.track.next(train.path);
train.advance_track(0);
- const TrackType::Endpoint &next_entry_ep = next_track.endpoint();
+ const TrackType::Endpoint &entry_ep = train.track.endpoint();
if(train.critical)
{
train.path = train.track->get_type().coerce_path(train.track.entry(), train.track->get_active_path());
}
else
{
- for(unsigned i=0; next_entry_ep.paths>>i; ++i)
- if(next_entry_ep.has_path(i))
+ for(unsigned i=0; entry_ep.paths>>i; ++i)
+ if(entry_ep.has_path(i))
{
train.path = i;
train.update_estimate();
i->update_estimate();
}
- if(next_entry_ep.paths!=next_track->get_type().get_paths() && !train.critical)
+ if(entry_ep.paths!=train.track->get_type().get_paths() && !train.critical)
{
RoutingStep wait(this);
wait.advance(dt);