X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=b5f600e09e3a58a9744cbef5e7844cf57252aa78;hb=14b71235fbf3406ed88fab9125ea646eb6a9b702;hp=74bc50328ce8b6bb60f7f917c149b97989d5e7b7;hpb=0c2a3e6c435fd4cf05cc5275f750d341842aa543;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 74bc503..b5f600e 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -89,6 +89,7 @@ void Train::add_vehicle(const VehicleType &vt)
 	vehicles.back()->attach_back(*veh);
 	vehicles.push_back(veh);
 	veh->set_train(this);
+	signal_vehicle_added.emit(vehicles.size()-1, *veh);
 }
 
 void Train::remove_vehicle(unsigned i)
@@ -97,10 +98,17 @@ void Train::remove_vehicle(unsigned i)
 		throw out_of_range("Train::remove_vehicle");
 	if(i==0)
 		throw logic_error("can't remove locomotive");
-	delete vehicles[i];
+
+	Vehicle *veh = vehicles[i];
 	vehicles.erase(vehicles.begin()+i);
+	veh->detach_front();
 	if(i<vehicles.size())
+	{
+		veh->detach_back();
 		vehicles[i-1]->attach_back(*vehicles[i]);
+	}
+	signal_vehicle_removed.emit(i, *veh);
+	delete veh;
 }
 
 unsigned Train::get_n_vehicles() const
@@ -185,6 +193,7 @@ void Train::place(const BlockIter &block)
 
 	allocator.start_from(block);
 	accurate_position = false;
+	last_entry_block = BlockIter();
 
 	if(reverse)
 		vehicles.front()->place(block.reverse().track_iter(), 0, Vehicle::FRONT_BUFFER);
@@ -199,6 +208,7 @@ void Train::unplace()
 
 	allocator.clear();
 	accurate_position = false;
+	last_entry_block = BlockIter();
 
 	for(vector<Vehicle *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
 		(*i)->unplace();
@@ -301,6 +311,7 @@ void Train::tick(const Time::TimeDelta &dt)
 		driver.set_loco_reverse(address, r);
 
 		allocator.reverse();
+		last_entry_block = BlockIter();
 	}
 
 	if(speed_quantizer)
@@ -340,6 +351,8 @@ void Train::tick(const Time::TimeDelta &dt)
 			}
 		}
 	}
+	else if(intent_to_move && !allocator.is_active())
+		allocator.set_active(true);
 	else if(allocator.is_active() && !intent_to_move && !stop_timeout)
 		stop_timeout = 2*Time::sec;
 }
@@ -412,27 +425,28 @@ void Train::loco_func_event(unsigned addr, unsigned func, bool state)
 
 void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
 {
-	Block *block = 0;
-	if(TrackCircuit *tc = dynamic_cast<TrackCircuit *>(&sensor))
-		block = &tc->get_block();
-	else
+	if(!current_speed_step || state!=Sensor::MAYBE_ACTIVE)
 		return;
 
-	if(block->get_train()==this && state==Sensor::MAYBE_ACTIVE)
+	Block *block = sensor.get_block();
+	if(!block || block->get_train()!=this)
+		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_id())
+				return;
+	}
+
+	if(dynamic_cast<TrackCircuit *>(&sensor))
 	{
-		if(last_entry_block)
+		if(last_entry_block && pure_speed && speed_quantizer)
 		{
-			float travel_distance = -1;
-			if(pure_speed && speed_quantizer && current_speed_step>0)
-				travel_distance = 0;
+			float travel_distance = 0;
 
 			for(BlockIter i=last_entry_block; &*i!=block; i=i.next())
-			{
-				if(i->get_sensor_id())
-					return;
-				if(travel_distance>=0)
-					travel_distance += i->get_path_length(i.entry());
-			}
+				travel_distance += i->get_path_length(i.entry());
 
 			if(travel_distance>0)
 			{
@@ -480,8 +494,7 @@ float Train::get_reserved_distance_until(const Block *until_block) const
 	if(!track)  // XXX Probably unnecessary
 		return 0;
 
-	BlockIter block = track.block_iter();
-	if(&*block==until_block)
+	if(&track->get_block()==until_block)
 		return 0;
 
 	// Account for the vehicle's offset on its current track
@@ -492,6 +505,8 @@ float Train::get_reserved_distance_until(const Block *until_block) const
 		result = track->get_type().get_path_length(track->get_active_path())-result;
 	result -= veh.get_type().get_length()/2;
 
+	BlockIter block = track.block_iter();
+
 	// Count remaining distance in the vehicle's current block
 	for(track=track.next(); &track->get_block()==&*block; track=track.next())
 		result += track->get_type().get_path_length(track->get_active_path());