X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.cpp;h=f73697a5b45381f8173b045ce70de1ac0abfd590;hb=cb4e53ba1b8ea41b978190de6668e9862b9cfea8;hp=55f932e4233f0652f368a75f2fe9607654f9e125;hpb=dda1e6c8716b6ac70d63a3f6ff95474a8b8b7336;p=r2c2.git

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index 55f932e..f73697a 100644
--- a/source/libr2c2/blockallocator.cpp
+++ b/source/libr2c2/blockallocator.cpp
@@ -1,9 +1,11 @@
 #include <msp/core/maputils.h>
 #include <msp/core/raii.h>
 #include "blockallocator.h"
+#include "block.h"
 #include "catalogue.h"
 #include "driver.h"
 #include "layout.h"
+#include "trackcircuit.h"
 #include "trackiter.h"
 #include "train.h"
 #include "vehicle.h"
@@ -22,9 +24,9 @@ BlockAllocator::BlockAllocator(Train &t):
 {
 	Layout &layout = train.get_layout();
 	layout.signal_block_reserved.connect(sigc::mem_fun(this, &BlockAllocator::block_reserved));
-	layout.signal_block_state_changed.connect(sigc::mem_fun(this, &BlockAllocator::block_state_changed));
+	layout.signal_sensor_state_changed.connect(sigc::mem_fun(this, &BlockAllocator::sensor_state_changed));
 
-	const set<Track *> &tracks = layout.get_tracks();
+	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())
 			(*i)->signal_path_changed.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &BlockAllocator::turnout_path_changed), sigc::ref(**i))));
@@ -227,17 +229,6 @@ bool BlockAllocator::reserve_block(const BlockIter &block)
 	}
 }
 
-void BlockAllocator::release_until(const Block &block)
-{
-	for(BlockList::iterator i=blocks.begin(); i!=cur_blocks_end; ++i)
-		if(i->block()==&block)
-		{
-			if(++i!=cur_blocks_end)
-				release_blocks_begin(i);
-			return;
-		}
-}
-
 bool BlockAllocator::release_from(const Block &block)
 {
 	bool have_sensor = false;
@@ -315,12 +306,18 @@ void BlockAllocator::block_reserved(Block &block, const Train *tr)
 		reserve_more();
 }
 
-void BlockAllocator::block_state_changed(Block &block, Block::State state)
+void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state)
 {
-	if(block.get_train()!=&train)
+	Block *block = 0;
+	if(TrackCircuit *tc = dynamic_cast<TrackCircuit *>(&sensor))
+		block = &tc->get_block();
+	else
+		return;
+
+	if(block->get_train()!=&train)
 		return;
 
-	if(state==Block::MAYBE_ACTIVE)
+	if(state==Sensor::MAYBE_ACTIVE)
 	{
 		// Find the first sensor block from our reserved blocks that isn't this sensor
 		BlockList::iterator end;
@@ -328,7 +325,7 @@ void BlockAllocator::block_state_changed(Block &block, Block::State state)
 		for(end=cur_blocks_end; end!=blocks.end(); ++end)
 			if((*end)->get_sensor_id())
 			{
-				if(&**end!=&block)
+				if(&**end!=block)
 				{
 					if(result==0)
 						result = 2;
@@ -351,7 +348,7 @@ void BlockAllocator::block_state_changed(Block &block, Block::State state)
 		else if(result==3)
 			train.get_layout().emergency("Sensor for "+train.get_name()+" triggered out of order");
 	}
-	else if(state==Block::INACTIVE)
+	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();