X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.cpp;h=5a410ff20de0af908df94952d6d2bdb46348e14f;hb=31f95d95a1cc7cf17df8de57ea122482d5f4a859;hp=e28558a7e0cd9e715e32722900dae39e544729b3;hpb=3313694dbe8775b5fd6e1a7eaafe0be9179fcb85;p=r2c2.git

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index e28558a..5a410ff 100644
--- a/source/libr2c2/blockallocator.cpp
+++ b/source/libr2c2/blockallocator.cpp
@@ -42,7 +42,7 @@ BlockAllocator::BlockAllocator(Train &t):
 
 	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_type().is_turnout())
 		{
 			(*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))));
@@ -207,7 +207,7 @@ void BlockAllocator::reserve_more()
 	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());
@@ -228,7 +228,7 @@ void BlockAllocator::reserve_more()
 			// 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. */
@@ -279,7 +279,7 @@ void BlockAllocator::reserve_more()
 		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());
@@ -339,6 +339,9 @@ void BlockAllocator::advance_front(const Block *block, bool inclusive)
 	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.
@@ -611,8 +614,8 @@ void BlockAllocator::Loader::block(unsigned id)
 	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;
 }