X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=4f6c2046d7d9e0528158bc5d5c6af560816e3cd0;hb=ab64a17394440c3cb18d0b30d75fb4ed6297a6b4;hp=6cb3205eb175fad4f6e6d8b18997a725df2da7b5;hpb=57e0944ee8ed442e2d0aa7c9964cac00450af5e7;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 6cb3205..4f6c204 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -53,6 +53,7 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
 		speed_quantizer = new SpeedQuantizer(speed_steps);
 
 	vehicles.push_back(new Vehicle(layout, loco_type));
+	vehicles.back()->set_train(this);
 
 	layout.add_train(*this);
 
@@ -87,6 +88,8 @@ void Train::add_vehicle(const VehicleType &vt)
 	Vehicle *veh = new Vehicle(layout, 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)
@@ -95,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
@@ -338,6 +348,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;
 }
@@ -561,6 +573,7 @@ void Train::Loader::vehicle(ArticleNumber art_nr)
 	Vehicle *veh = new Vehicle(obj.layout, vtype);
 	obj.vehicles.back()->attach_back(*veh);
 	obj.vehicles.push_back(veh);
+	veh->set_train(&obj);
 }
 
 } // namespace R2C2