X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.cpp;h=7e992e00f41b65f6aecdc6afd6e89ec03e899bd0;hb=7f63edbdf0d3c08893bdd2341ec3e50fb1ccc6f8;hp=6e2a11cde0bedf77295b089f97961d8467859c98;hpb=ab3073367fb8e7d7b534b5c5b81a16346ba20717;p=r2c2.git

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index 6e2a11c..7e992e0 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;
+				}
 			}
 		}
 
@@ -347,7 +337,7 @@ void BlockAllocator::advance_front(const Block *block, bool inclusive)
 	// Update cur_blocks_end first to keep things consistent.
 	cur_blocks_end = end;
 	for(; i!=end; ++i)
-		train.signal_advanced.emit(**i);
+		signal_advanced.emit(**i, (*i)->get_sensor());
 }
 
 void BlockAllocator::advance_front(const Sensor *sensor)
@@ -364,6 +354,8 @@ void BlockAllocator::advance_back()
 	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();
 
+	bool pending_cleared = false;
+
 	/* Sensors aren't guaranteed to be detriggered in order.  Go through the
 	block list and locate the first sensor that's still active. */
 	BlockList::iterator end = blocks.end();
@@ -397,6 +389,9 @@ void BlockAllocator::advance_back()
 				end = i;
 		}
 
+		if(block==pending_block)
+			pending_cleared = true;
+
 		// Stop if we encounter an active sensor or the train's last vehicle
 		if(block==&veh_block || active_sensor)
 		{
@@ -407,7 +402,12 @@ void BlockAllocator::advance_back()
 				if(i!=end)
 					++end;
 				release_blocks_begin(end);
+				signal_rear_advanced.emit(*last());
 			}
+
+			if(pending_cleared)
+				reserve_more();
+
 			return;
 		}
 	}
@@ -498,6 +498,8 @@ void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state)
 	{
 		if(&sensor==next_sensor)
 		{
+			if(is_block_current(*block))
+				signal_advanced.emit(*block, &sensor);
 			update_next_sensor(next_sensor);
 			advance_front(next_sensor);
 
@@ -505,7 +507,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();