X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=b278948a83ed9c8d38d7694f293037a48ef99842;hb=4acf89b0ec739c0bef8b11d3a52a4c551efa881e;hp=8e10026f182bee49987318eb0daee177ad679873;hpb=b51fbe499f1fd68a1abcbdee913cde1ccb580bca;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 8e10026..b278948 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -68,6 +68,8 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
 	layout.get_driver().signal_halt.connect(sigc::mem_fun(this, &Train::halt_event));
 
 	controller->signal_control_changed.connect(sigc::mem_fun(this, &Train::control_changed));
+
+	allocator.signal_advanced.connect(signal_advanced);
 }
 
 Train::~Train()
@@ -358,7 +360,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 +371,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;
 			}
 		}