X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=78137b8703ddfc7162ec173f83046ff31bfe877b;hb=9cb5f9ef3c0eaac499ef5d045c513116d6809e56;hp=34b80ddcc39d213635431e50613ecdce29776d51;hpb=9ad36841021cdd5c7f14d52e946d8ecdb602cf78;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 34b80dd..78137b8 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -358,7 +358,8 @@ void Train::tick(const Time::TimeDelta &dt)
 		Vehicle &vehicle = *(reverse ? vehicles.back() : vehicles.front());
 
 		float d = speed*(dt/Time::sec);
-		if(allocator.is_block_current(vehicle.get_placement().get_position(reverse ? VehiclePlacement::BACK_AXLE : VehiclePlacement::FRONT_AXLE)->get_block()))
+		Block &block = vehicle.get_placement().get_position(reverse ? VehiclePlacement::BACK_AXLE : VehiclePlacement::FRONT_AXLE)->get_block();
+		if(allocator.is_block_current(block))
 		{
 			SetFlag setf(advancing);
 			vehicle.advance(reverse ? -d : d);
@@ -368,7 +369,7 @@ void Train::tick(const Time::TimeDelta &dt)
 			overshoot_dist += d;
 			if(overshoot_dist>40*layout.get_catalogue().get_scale())
 			{
-				layout.emergency(name+" has not arrived at sensor");
+				layout.emergency(&block, name+" has not arrived at sensor");
 				accurate_position = false;
 			}
 		}
@@ -487,8 +488,11 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
 
 		last_entry_block = allocator.iter_for(*block);
 		travel_time = Time::zero;
-		pure_speed = true;
-		accurate_position = true;
+		if(!layout.get_driver().is_halted())
+		{
+			pure_speed = true;
+			accurate_position = true;
+		}
 		overshoot_dist = 0;
 
 		if(!advancing && vehicles.front()->is_placed())