}
else
{
- const TrackType::Endpoint &entry_ep = track.endpoint();
unsigned path = track->get_active_path();
- if(!entry_ep.has_path(path))
+ if(!track.endpoint().has_path(path))
{
- const TrackType::Endpoint &exit_ep = track.reverse().endpoint();
- if(entry_ep.has_common_paths(exit_ep))
+ path = track->get_type().coerce_path(track.entry(), path);
+ track->set_active_path(path);
+ if(track->is_path_changing())
{
- unsigned mask = entry_ep.paths&exit_ep.paths;
- for(path=0; mask>1; ++path, mask>>=1) ;
-
- track->set_active_path(path);
- if(track->is_path_changing())
- {
- pending_block = &*block;
- break;
- }
- }
- else
- // XXX Do something here
+ pending_block = &*block;
break;
+ }
}
}
// Update cur_blocks_end first to keep things consistent.
cur_blocks_end = end;
for(; i!=end; ++i)
- train.signal_advanced.emit(**i);
+ signal_advanced.emit(**i, (*i)->get_sensor());
}
void BlockAllocator::advance_front(const Sensor *sensor)
if(i!=end)
++end;
release_blocks_begin(end);
+ signal_rear_advanced.emit(*last());
}
return;
}
{
if(&sensor==next_sensor)
{
+ if(is_block_current(*block))
+ signal_advanced.emit(*block, &sensor);
update_next_sensor(next_sensor);
advance_front(next_sensor);
reserve_more();
}
else if(!is_block_current(*block))
- train.get_layout().emergency("Sensor for "+train.get_name()+" triggered out of order");
+ train.get_layout().emergency(block, "Sensor for "+train.get_name()+" triggered out of order");
}
else if(state==Sensor::INACTIVE)
advance_back();