X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.cpp;h=5a410ff20de0af908df94952d6d2bdb46348e14f;hb=0d0b5fcbaf3e8eb1cbfd9764d19792c4383cce7b;hp=347960ee2ec584029a7bc66dffaaabb56de0cdad;hpb=b5e23ed067e75f17419dc04be872d2162eac01e9;p=r2c2.git

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index 347960e..5a410ff 100644
--- a/source/libr2c2/blockallocator.cpp
+++ b/source/libr2c2/blockallocator.cpp
@@ -28,6 +28,7 @@ struct BlockAllocator::BlockMatch
 
 BlockAllocator::BlockAllocator(Train &t):
 	train(t),
+	active(false),
 	cur_blocks_end(blocks.end()),
 	next_sensor(0),
 	pending_block(0),
@@ -41,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))));
@@ -60,13 +61,53 @@ void BlockAllocator::set_active(bool a)
 	}
 }
 
-void BlockAllocator::start_from(const BlockIter &block)
+bool BlockAllocator::start_from(const BlockIter &block)
 {
 	if(!block)
 		throw invalid_argument("BlockAllocator::start_from");
 
+	float remaining_length = 0;
+	unsigned n_vehs = train.get_n_vehicles();
+	for(unsigned i=0; i<n_vehs; ++i)
+		remaining_length += train.get_vehicle(i).get_type().get_length();
+
 	clear();
-	reserve_block(block);
+
+	BlockList blocks_to_reserve;
+	for(BlockIter b=block; b; b=b.next())
+	{
+		if(b->get_train())
+			break;
+		blocks_to_reserve.push_back(b);
+		for(TrackIter t=b.track_iter(); (t && &t->get_block()==&*b); t=t.next())
+			remaining_length -= t->get_path_length();
+		if(remaining_length<=0)
+			break;
+	}
+
+	if(remaining_length>0)
+		return false;
+
+	for(BlockList::iterator i=blocks_to_reserve.begin(); i!=blocks_to_reserve.end(); ++i)
+	{
+		blocks.push_back(*i);
+		try
+		{
+			(*i)->reserve(&train);
+		}
+		catch(...)
+		{
+			blocks.pop_back();
+			while(i!=blocks_to_reserve.begin())
+			{
+				blocks.pop_back();
+				(*--i)->reserve(0);
+			}
+			throw;
+		}
+	}
+
+	return true;
 }
 
 void BlockAllocator::rewind_to(const Block &block)
@@ -166,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());
@@ -187,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. */
@@ -238,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());
@@ -298,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.
@@ -316,8 +360,9 @@ void BlockAllocator::advance_front(const Sensor *sensor)
 
 void BlockAllocator::advance_back()
 {
-	const Vehicle &veh = train.get_vehicle(train.get_controller().get_reverse() ? 0 : train.get_n_vehicles()-1);
-	const Block &veh_block = veh.get_track()->get_block();
+	bool rev = train.get_controller().get_reverse();
+	const Vehicle &veh = train.get_vehicle(rev ? 0 : train.get_n_vehicles()-1);
+	const Block &veh_block = veh.get_placement().get_position(rev ? VehiclePlacement::FRONT_AXLE : VehiclePlacement::BACK_AXLE)->get_block();
 
 	/* Sensors aren't guaranteed to be detriggered in order.  Go through the
 	block list and locate the first sensor that's still active. */
@@ -569,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;
 }