X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=ba1a861b9e24ec75f14a91049d8d3a76b54fc29f;hb=e77b01f9fed6d5f653dbd0123f0f1f61a13c3dfa;hp=78c16c072809ce74f2df57edac7b313d22826342;hpb=34f8bf04e4bdffefeceea59b186386b51c542b9d;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 78c16c0..ba1a861 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));
 
@@ -583,6 +583,7 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 		(*i)->tick(t, dt);
 	controller->tick(dt);
 	float speed = controller->get_speed();
+	bool moving = speed>0;
 
 	if(controller->get_reverse()!=reverse)
 	{
@@ -609,7 +610,7 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 		speed = speed_quantizer->get_speed(current_speed_step);
 	}
 
-	if(speed)
+	if(moving)
 	{
 		if(!active)
 			set_active(true);
@@ -734,9 +735,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 +745,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;
@@ -762,7 +763,7 @@ void Train::sensor_event(unsigned addr, bool state)
 			// Compute speed and update related state
 			float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
 
-			if(pure_speed && speed_quantizer && current_speed_step>0)
+			if(pure_speed && speed_quantizer && current_speed_step>0 && travel_time_secs>=2)
 				speed_quantizer->learn(current_speed_step, travel_dist/travel_time_secs, travel_time_secs);
 
 			travel_dist = 0;
@@ -770,7 +771,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 +814,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());