From ab64a17394440c3cb18d0b30d75fb4ed6297a6b4 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 28 Jun 2013 22:24:13 +0300
Subject: [PATCH] Add signals for adding and removing vehicles

---
 source/libr2c2/train.cpp | 10 +++++++++-
 source/libr2c2/train.h   |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index e8df4d8..4f6c204 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
diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index f378389..3aaf6b1 100644
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -43,6 +43,8 @@ public:
 	sigc::signal<void, unsigned, bool> signal_function_changed;
 	sigc::signal<void, TrainAI &, const TrainAI::Message &> signal_ai_event;
 	sigc::signal<void, Block &> signal_advanced;
+	sigc::signal<void, unsigned, Vehicle &> signal_vehicle_added;
+	sigc::signal<void, unsigned, Vehicle &> signal_vehicle_removed;
 
 private:
 	Layout &layout;
-- 
2.43.0