X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=b2b4899f9aa6eb7cc1ad83cee23039d073c4b5f4;hb=baa096deb2108fe7f692172602ec2d047b68c068;hp=28976838fcf7da9c699ed11b8b461cdab566fd41;hpb=247742fbc1c27bfc9fdef4630afcdc2408cdd550;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 2897683..b2b4899 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -675,11 +675,13 @@ void Train::control_changed(const Controller::Control &ctrl)
 	signal_control_changed.emit(ctrl.name, ctrl.value);
 }
 
-void Train::loco_speed_event(unsigned addr, unsigned speed, bool)
+void Train::loco_speed_event(unsigned addr, unsigned speed, bool rev)
 {
 	if(addr==address)
 	{
 		current_speed_step = speed;
+		if(rev!=reverse)
+			layout.get_driver().set_loco_reverse(address, reverse);
 		speed_changing = false;
 		pure_speed = false;
 	}
@@ -872,7 +874,10 @@ void Train::reserve_more()
 		if(!block || block->get_endpoints().size()<2)
 		{
 			if(!blocking_train)
+			{
 				good_end = blocks.end();
+				end_of_route = true;
+			}
 			break;
 		}
 
@@ -976,7 +981,7 @@ void Train::reserve_more()
 				contested_blocks.push_back(block);
 				continue;
 			}
-			else if(divert_track && (entry_conflict || exit_conflict))
+			else if(divert_track && (entry_conflict || exit_conflict || !other_train->is_active()))
 				// We are blocked, but there's a diversion possibility
 				try_divert = true;