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

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 34b80dd..b670d41 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -63,11 +63,12 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
 	layout.get_driver().signal_loco_speed.connect(sigc::mem_fun(this, &Train::loco_speed_event));
 	layout.get_driver().signal_loco_function.connect(sigc::mem_fun(this, &Train::loco_func_event));
 
-	layout.signal_sensor_state_changed.connect(sigc::mem_fun(this, &Train::sensor_state_changed));
-
 	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(sigc::mem_fun(this, &Train::advanced));
+	allocator.signal_rear_advanced.connect(signal_rear_advanced);
 }
 
 Train::~Train()
@@ -358,7 +359,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 +370,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;
 			}
 		}
@@ -451,29 +453,21 @@ void Train::loco_func_event(unsigned id, unsigned func, bool state)
 	}
 }
 
-void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
+void Train::advanced(Block &block, Sensor *sensor)
 {
-	if(!current_speed_step || state!=Sensor::MAYBE_ACTIVE)
-		return;
+	if(!sensor || sensor==block.get_sensor())
+		signal_advanced.emit(block);
 
-	Block *block = sensor.get_block();
-	if(!block || block->get_train()!=this)
+	if(!sensor)
 		return;
 
-	if(last_entry_block && &*last_entry_block!=block)
-	{
-		for(BlockIter i=last_entry_block.next(); (i && &*i!=block); i=i.next())
-			if(i->get_train()!=this || i->get_sensor_address())
-				return;
-	}
-
-	if(dynamic_cast<TrackCircuit *>(&sensor))
+	if(sensor==block.get_sensor())
 	{
 		if(last_entry_block && pure_speed && speed_quantizer)
 		{
 			float travel_distance = 0;
 
-			for(BlockIter i=last_entry_block; &*i!=block; i=i.next())
+			for(BlockIter i=last_entry_block; &*i!=&block; i=i.next())
 				travel_distance += i->get_path_length(i.entry());
 
 			if(travel_distance>0)
@@ -485,10 +479,13 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
 			}
 		}
 
-		last_entry_block = allocator.iter_for(*block);
+		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())
@@ -503,12 +500,12 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
 				vehicles.front()->place(track, VehiclePlacement::FRONT_AXLE);
 		}
 	}
-	else if(BeamGate *gate = dynamic_cast<BeamGate *>(&sensor))
+	else if(BeamGate *gate = dynamic_cast<BeamGate *>(sensor))
 	{
 		if(!advancing && vehicles.front()->is_placed())
 		{
-			TrackIter track = allocator.iter_for(*block).track_iter();
-			for(; (track && &track->get_block()==block); track=track.next())
+			TrackIter track = allocator.iter_for(block).track_iter();
+			for(; (track && &track->get_block()==&block); track=track.next())
 				if(track.track()==gate->get_track())
 				{
 					if(reverse)