X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.cpp;h=a054c157331c9b5e9ed074da4fc99469e2b0ee8e;hb=64d23de66c33d0f77454c3db2e40cccc18f7851b;hp=215d746a25e3442bbe0cad476028545d53569789;hpb=110a865e1a175f304ecaaa7a31b6985cf0c12a99;p=r2c2.git

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index 215d746..a054c15 100644
--- a/source/libr2c2/blockallocator.cpp
+++ b/source/libr2c2/blockallocator.cpp
@@ -1,5 +1,6 @@
 #include <msp/core/maputils.h>
 #include <msp/core/raii.h>
+#include "beamgate.h"
 #include "blockallocator.h"
 #include "block.h"
 #include "catalogue.h"
@@ -247,7 +248,7 @@ void BlockAllocator::reserve_more()
 	{
 		update_next_sensor(0);
 		// Immediately advance to just before the next sensor
-		advance_to(next_sensor ? next_sensor->get_block() : 0);
+		advance_front(next_sensor);
 	}
 }
 
@@ -273,11 +274,18 @@ bool BlockAllocator::reserve_block(const BlockIter &block)
 	}
 }
 
-void BlockAllocator::advance_to(const Block *block)
+void BlockAllocator::advance_front(const Block *block, bool inclusive)
 {
 	BlockList::iterator end;
 	if(block)
-		end = find_if(cur_blocks_end, blocks.end(), BlockMatch(*block));
+	{
+		end = cur_blocks_end;
+		if(inclusive)
+			--end;
+		end = find_if(end, blocks.end(), BlockMatch(*block));
+		if(inclusive && end!=blocks.end())
+			++end;
+	}
 	else
 		end = blocks.end();
 
@@ -289,6 +297,68 @@ void BlockAllocator::advance_to(const Block *block)
 		train.signal_advanced.emit(**i);
 }
 
+void BlockAllocator::advance_front(const Sensor *sensor)
+{
+	if(sensor)
+		advance_front(sensor->get_block(), dynamic_cast<const BeamGate *>(sensor));
+	else
+		advance_front(0, false);
+}
+
+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();
+
+	/* 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();
+	for(BlockList::iterator i=blocks.begin(); i!=cur_blocks_end; ++i)
+	{
+		Block *block = &**i;
+		list<Sensor *> sensors;
+
+		/* Collect all sensors from the block in the order they are expected to
+		detrigger. */
+		for(TrackIter j=i->track_iter(); (j && &j->get_block()==block); j=j.next())
+			if(!j->get_attachments().empty())
+			{
+				Track::AttachmentList attachments = j->get_attachments_ordered(j.entry());
+				for(Track::AttachmentList::const_iterator k=attachments.begin(); k!=attachments.end(); ++k)
+					if(BeamGate *gate = dynamic_cast<BeamGate *>(*k))
+						sensors.push_back(gate);
+			}
+
+		if(Sensor *sensor = (*i)->get_sensor())
+			sensors.push_back(sensor);
+
+		/* See if any sensor is still active, and record the position of the
+		last inactive sensor. */
+		bool active_sensor = false;
+		for(list<Sensor *>::const_iterator j=sensors.begin(); (!active_sensor && j!=sensors.end()); ++j)
+		{
+			if((*j)->get_state())
+				active_sensor = true;
+			else
+				end = i;
+		}
+
+		// Stop if we encounter an active sensor or the train's last vehicle
+		if(block==&veh_block || active_sensor)
+		{
+			if(end!=blocks.end())
+			{
+				/* If the last inactive sensor was in an earlier block, release
+				that block as well. */
+				if(i!=end)
+					++end;
+				release_blocks_begin(end);
+			}
+			return;
+		}
+	}
+}
+
 void BlockAllocator::release_blocks_begin(const BlockList::iterator &end)
 {
 	for(BlockList::iterator i=blocks.begin(); i!=end; )
@@ -375,7 +445,7 @@ void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state)
 		if(&sensor==next_sensor)
 		{
 			update_next_sensor(next_sensor);
-			advance_to(next_sensor ? next_sensor->get_block() : 0);
+			advance_front(next_sensor);
 
 			if(active)
 				reserve_more();
@@ -384,47 +454,53 @@ void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state)
 			train.get_layout().emergency("Sensor for "+train.get_name()+" triggered out of order");
 	}
 	else if(state==Sensor::INACTIVE)
-	{
-		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();
-
-		/* 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();
-		for(BlockList::iterator i=blocks.begin(); i!=cur_blocks_end; ++i)
-		{
-			// Avoid freeing blocks that still hold the train's vehicles
-			if(&**i==&veh_block)
-				break;
-
-			if(Sensor *s = (*i)->get_sensor())
-			{
-				if(s->get_state()>=Sensor::MAYBE_INACTIVE)
-					break;
-				else
-					end = i;
-			}
-		}
-		
-		if(end!=blocks.end())
-			// Free blocks up to the last inactive sensor
-			release_blocks_begin(++end);
-	}
+		advance_back();
 }
 
 void BlockAllocator::update_next_sensor(Sensor *after)
 {
+	BeamGate *after_gate = dynamic_cast<BeamGate *>(after);
+
 	BlockList::iterator i = cur_blocks_end;
 	if(after)
+	{
+		if(after_gate)
+			--i;
 		i = find_if(i, blocks.end(), BlockMatch(*after->get_block()));
+	}
 
 	for(; i!=blocks.end(); ++i)
+	{
 		if(Sensor *sensor = (*i)->get_sensor())
-			if(sensor!=next_sensor)
+		{
+			if(!after_gate && sensor!=next_sensor)
 			{
 				next_sensor = sensor;
 				return;
 			}
+		}
+
+		Block *block = &**i;
+		for(TrackIter j=i->track_iter(); (j && &j->get_block()==block); j=j.next())
+			if(!j->get_attachments().empty())
+			{
+				Track::AttachmentList attachments = j->get_attachments_ordered(j.entry());
+				for(Track::AttachmentList::const_iterator k=attachments.begin(); k!=attachments.end(); ++k)
+					if(BeamGate *gate = dynamic_cast<BeamGate *>(*k))
+					{
+						if(after_gate)
+						{
+							if(gate==after_gate)
+								after_gate = 0;
+						}
+						else
+						{
+							next_sensor = gate;
+							return;
+						}
+					}
+			}
+	}
 
 	next_sensor = 0;
 }