const set<Track *> &tracks = layout.get_all<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- if((*i)->get_turnout_id())
+ if((*i)->get_turnout_address())
{
(*i)->signal_path_changing.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &BlockAllocator::turnout_path_changing), sigc::ref(**i))));
(*i)->signal_path_changed.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &BlockAllocator::turnout_path_changed), sigc::ref(**i))));
float dist = 0;
for(BlockList::const_iterator i=cur_blocks_end; i!=blocks.end(); ++i)
{
- if((*i)->get_sensor_id())
+ if((*i)->get_sensor_address())
++nsens;
if(nsens>0)
dist += (*i)->get_path_length(i->entry());
// The track ends here
break;
- if(block->get_turnout_id() && !prev->get_turnout_id())
+ if(block->get_turnout_address() && !prev->get_turnout_address())
{
/* We are arriving at a turnout. See if we have enough blocks and
distance reserved. */
if(&*block==stop_at_block)
break;
- if(block->get_sensor_id())
+ if(block->get_sensor_address())
++nsens;
if(nsens>0)
dist += block->get_path_length(block.entry());
else
end = blocks.end();
+ if(end==blocks.end() && blocks.back().block()==pending_block)
+ --end;
+
SetFlag setf(advancing);
BlockList::iterator i = cur_blocks_end;
// Update cur_blocks_end first to keep things consistent.
obj.blocks.push_back(BlockIter(blk, entry));
blk->reserve(&obj.train);
- if(blk->get_sensor_id())
- obj.train.get_layout().get_driver().set_sensor(blk->get_sensor_id(), true);
+ if(blk->get_sensor_address())
+ obj.train.get_layout().get_driver().set_sensor(blk->get_sensor_address(), true);
prev_block = blk;
}