X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fvehicle.cpp;h=e4bab870f856434b1e7e79f9b6c54543986921ee;hb=4049f5bdacfdb61247f3c74fc5f748990be7bd4d;hp=e33f643c8ddc69d710a63ef3019d988a593bab0e;hpb=f23c8d8cbc4e72b45e3a719b2cf974ce35d054e9;p=r2c2.git

diff --git a/source/3d/vehicle.cpp b/source/3d/vehicle.cpp
index e33f643..e4bab87 100644
--- a/source/3d/vehicle.cpp
+++ b/source/3d/vehicle.cpp
@@ -14,9 +14,8 @@ using namespace Msp;
 namespace R2C2 {
 
 Vehicle3D::Vehicle3D(Layout3D &l, Vehicle &v):
-	Object3D(v),
+	Object3D(l, v),
 	GL::ObjectInstance(*l.get_catalogue().get_vehicle(v.get_type()).get_body_object()),
-	layout(l),
 	vehicle(v),
 	type(layout.get_catalogue().get_vehicle(vehicle.get_type()))
 {
@@ -56,13 +55,11 @@ Vehicle3D::Vehicle3D(Layout3D &l, Vehicle &v):
 			layout.get_scene().add(*r);
 		}
 
-	layout.add_vehicle(*this);
 	layout.get_scene().add(*this);
 }
 
 Vehicle3D::~Vehicle3D()
 {
-	layout.remove_vehicle(*this);
 	layout.get_scene().remove(*this);
 	for(vector<Axle3D *>::iterator i=axles.begin(); i!=axles.end(); ++i)
 	{