X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=00730c8e15e08fd048b35b137d51c7adcac51d91;hb=b14059de03324aecde3efc649293d98ce5b7aaf2;hp=78c16c072809ce74f2df57edac7b313d22826342;hpb=45abb4c64c714cb655988a855158a22976f5e35f;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 78c16c0..00730c8 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -85,7 +85,7 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
 	layout.get_driver().signal_loco_function.connect(sigc::mem_fun(this, &Train::loco_func_event));
 
 	layout.signal_block_reserved.connect(sigc::mem_fun(this, &Train::block_reserved));
-	layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Train::sensor_event));
+	layout.signal_block_state_changed.connect(sigc::mem_fun(this, &Train::block_state_changed));
 
 	layout.get_driver().signal_halt.connect(sigc::mem_fun(this, &Train::halt_event));
 
@@ -734,9 +734,9 @@ void Train::loco_func_event(unsigned addr, unsigned func, bool state)
 	}
 }
 
-void Train::sensor_event(unsigned addr, bool state)
+void Train::block_state_changed(Block &block, Block::State state)
 {
-	if(state)
+	if(state==Block::MAYBE_ACTIVE)
 	{
 		// Find the first sensor block from our reserved blocks that isn't this sensor
 		BlockList::iterator end;
@@ -744,7 +744,7 @@ void Train::sensor_event(unsigned addr, bool state)
 		for(end=cur_blocks_end; end!=blocks.end(); ++end)
 			if((*end)->get_sensor_id())
 			{
-				if((*end)->get_sensor_id()!=addr)
+				if(&**end!=&block)
 				{
 					if(result==0)
 						result = 2;
@@ -770,7 +770,7 @@ void Train::sensor_event(unsigned addr, bool state)
 			{
 				travel_dist += (*j)->get_path_length(j->entry());
 
-				if((*j)->get_sensor_id()==addr && !advancing)
+				if(&**j==&block && !advancing)
 				{
 					TrackIter track = j->track_iter();
 					if(reverse)
@@ -813,7 +813,7 @@ void Train::sensor_event(unsigned addr, bool state)
 		else if(result==3)
 			layout.emergency("Sensor for "+name+" triggered out of order");
 	}
-	else
+	else if(state==Block::INACTIVE)
 	{
 		const Vehicle &veh = *(reverse ? vehicles.front() : vehicles.back());