X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=1447ca58df834c86f7a14d27610e0959bb38c560;hb=d084e6f369a829f41086d1f7f9befa52d0392d58;hp=5b03e9b5e6946827a966080de5fb86084a8db0fa;hpb=cb222b6df855da4196a331c5b9859750c4321fa0;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 5b03e9b..1447ca5 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -443,8 +443,7 @@ void Train::unplace()
 
 bool Train::free_block(Block &block)
 {
-	float margin = 10*layout.get_catalogue().get_scale();
-	if(get_reserved_distance_until(&block, false)<controller->get_braking_distance()*1.3+margin)
+	if(get_reserved_distance_until(&block, false)<controller->get_braking_distance()*1.3)
 		return false;
 
 	unsigned nsens = 0;
@@ -534,7 +533,15 @@ int Train::get_entry_to_block(Block &block) const
 
 float Train::get_reserved_distance() const
 {
-	return get_reserved_distance_until(0, false);
+	if(blocks.empty())
+		return 0;
+
+	float margin = 0;
+	TrackIter next = blocks.back().next().track_iter();
+	if(next->get_type().is_turnout())
+		margin = 15*layout.get_catalogue().get_scale();
+
+	return max(get_reserved_distance_until(0, false)-margin, 0.0f);
 }
 
 void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
@@ -775,6 +782,8 @@ void Train::sensor_event(unsigned addr, bool state)
 			}
 
 			// Move blocks up to the next sensor to our current blocks
+			for(BlockList::iterator j=cur_blocks_end; j!=end; ++j)
+				signal_advanced.emit(**j);
 			cur_blocks_end = end;
 
 			// Try to get more blocks if we're moving
@@ -1180,10 +1189,10 @@ unsigned Train::find_speed_step(float real) const
 		if(real_speed[i].weight)
 		{
 			last = i;
-			if(real_speed[i].speed<real)
-				low = i;
-			else
+			if(real_speed[i].speed>=real)
 				high = i;
+			else if(real_speed[i].speed>real_speed[low].speed)
+				low = i;
 		}
 	if(!high)
 	{