X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.cpp;h=88fb12e8145baaf3f4e636311f9664b5a0a86e1d;hb=dfd78df0c79d03404d1f2e70c08b643655455725;hp=2c92ddc647a5178672200f3cb49ffc5b62f18715;hpb=b28062f2dc88e082ee5a28b2e1f7c4c8bd989023;p=r2c2.git

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index 2c92ddc..88fb12e 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_address())
+		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))));
@@ -253,26 +253,16 @@ void BlockAllocator::reserve_more()
 		}
 		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;
+				}
 			}
 		}
 
@@ -339,6 +329,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.
@@ -502,7 +495,7 @@ void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state)
 				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();