X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.cpp;h=2e816775f7dfa7c86683a559e3f1f638e436b33f;hb=d051af7264ee62d03473f1929414e262e918c30a;hp=a054c157331c9b5e9ed074da4fc99469e2b0ee8e;hpb=13f72e25cd6cb68d7fa0c0ab798616a148c39e43;p=r2c2.git

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index a054c15..2e81677 100644
--- a/source/libr2c2/blockallocator.cpp
+++ b/source/libr2c2/blockallocator.cpp
@@ -60,13 +60,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_type().get_path_length(t->get_active_path());
+		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)
@@ -257,10 +297,17 @@ bool BlockAllocator::reserve_block(const BlockIter &block)
 	/* Add it to the list first to present a consistent state in block_reserved
 	signal. */
 	blocks.push_back(block);
+
+	bool first_reserve = (cur_blocks_end==blocks.end());
+	if(first_reserve)
+		--cur_blocks_end;
+
 	try
 	{
 		if(!block->reserve(&train))
 		{
+			if(first_reserve)
+				cur_blocks_end = blocks.end();
 			blocks.pop_back();
 			return false;
 		}
@@ -269,6 +316,8 @@ bool BlockAllocator::reserve_block(const BlockIter &block)
 	}
 	catch(...)
 	{
+		if(first_reserve)
+			cur_blocks_end = blocks.end();
 		blocks.pop_back();
 		throw;
 	}
@@ -307,8 +356,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. */
@@ -413,7 +463,7 @@ void BlockAllocator::reverse()
 
 void BlockAllocator::turnout_path_changing(Track &track)
 {
-	BlockList::iterator i = find_if(blocks.begin(), blocks.end(), BlockMatch(track.get_block()));
+	BlockList::iterator i = find_if(cur_blocks_end, blocks.end(), BlockMatch(track.get_block()));
 	if(i!=blocks.end())
 	{
 		++i;