void TrainRouter::route_changed()
{
- BlockIter fncb = train.get_first_noncritical_block();
+ BlockIter fncb = train.get_last_critical_block().next();
arrival = ON_THE_WAY;
reserving_route = routes.begin();
/* Find the route that should be used for the next allocated block. We
can't rely on the resync code in block_reserved since we may need to
clear the stop marker to continue allocation. */
- TrackIter track = train.get_block_allocator().first().track_iter();
+ const BlockAllocator &allocator = train.get_block_allocator();
+ TrackIter track = allocator.first().track_iter();
list<SequencePoint>::iterator seq_begin = sequence_points.begin();
for(; track; track=track.next())
{
if(!advance_to_track(reserving_route, track))
{
- arrival = RESERVED_TO_END;
+ arrival = (allocator.is_block_current(track->get_block()) ? ADVANCED_TO_END : RESERVED_TO_END);
break;
}
if(&track->get_block()==fncb.block())
sequence_check_pending = false;
}
- if(arrival==RESERVED_TO_END && !train.get_speed())
+ if(arrival==ADVANCED_TO_END && !train.get_speed())
{
signal_arrived.emit(waypoints.back());
signal_event.emit(Message("arrived", waypoints.back()));
{
BlockIter b_iter = train.get_block_allocator().iter_for(block);
- if(waypoints.size()>1)
+ if(!waypoints.empty())
{
// A waypoint is considered reached when the train has advanced through it.
const TrackChain &wp = *waypoints.front();
{
if(!wp.has_track(*t_iter))
{
- waypoints.erase(waypoints.begin());
- metrics_stale = true;
- signal_waypoint_reached.emit(&wp);
- signal_event.emit(Message("waypoint-reached", &wp));
+ if(waypoints.size()==1)
+ {
+ if(arrival==RESERVED_TO_END)
+ arrival = ADVANCED_TO_END;
+ }
+ else
+ {
+ waypoints.erase(waypoints.begin());
+ metrics_stale = true;
+ signal_waypoint_reached.emit(&wp);
+ signal_event.emit(Message("waypoint-reached", &wp));
+ }
break;
}
else if(!block.has_track(*t_iter))
if(routes.empty() || !train.is_placed())
return false;
- BlockIter fncb = train.get_first_noncritical_block();
- TrackIter next_track = fncb.track_iter();
+ BlockIter lcb = train.get_last_critical_block();
+ TrackIter last_track_rev = lcb.reverse().track_iter();
unsigned count = 0;
- for(TrackIter i=next_track.flip(); (i && i->get_block().get_train()==&train); i=i.next())
+ for(TrackIter i=last_track_rev; (i && i->get_block().get_train()==&train); i=i.next())
{
if(routes.front()->has_track(*i))
++count;
else if(count>0)
{
if(count==routes.front()->get_tracks().size())
- next_track = i.flip();
+ last_track_rev = i;
break;
}
}
- if(!routes.front()->has_track(*next_track) && !routes.front()->has_track(*next_track.flip()))
+ TrackIter next_track = last_track_rev.flip();
+ if(!routes.front()->has_track(*last_track_rev) && !routes.front()->has_track(*next_track))
{
Route *pf = Route::find(next_track, *routes.front());
if(!pf)
}
Route *lead = 0;
- for(TrackIter i=next_track.flip(); (i && i->get_block().get_train()==&train); i=i.next())
+ for(TrackIter i=last_track_rev; (i && i->get_block().get_train()==&train); i=i.next())
{
if(!lead && !routes.front()->has_track(*i))
{