X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fvehicletype.cpp;h=0c057e26203b79075eb1207f2c4b6c4b7bbda2f3;hb=a4566a4a23ff676f11a90615e8e468ef50107946;hp=0913401e45b89b12c301361b6bc56655cf7444c5;hpb=e5cd9e4fbc577036a0385c985b6b65df8218d0a2;p=r2c2.git

diff --git a/source/libmarklin/vehicletype.cpp b/source/libmarklin/vehicletype.cpp
index 0913401..0c057e2 100644
--- a/source/libmarklin/vehicletype.cpp
+++ b/source/libmarklin/vehicletype.cpp
@@ -19,6 +19,19 @@ VehicleType::VehicleType(unsigned n):
 { }
 
 
+VehicleType::Axle::Axle():
+	position(0),
+	wheel_dia(0),
+	powered(false)
+{ }
+
+
+VehicleType::Bogie::Bogie():
+	position(0),
+	rotate_object(false)
+{ }
+
+
 VehicleType::Loader::Loader(VehicleType &vt):
 	DataFile::ObjectLoader<VehicleType>(vt)
 {
@@ -26,6 +39,7 @@ VehicleType::Loader::Loader(VehicleType &vt):
 	add("bogie",  &Loader::bogie);
 	add("height", &Loader::height);
 	add("length", &Loader::length);
+	add("object", &VehicleType::object);
 	add("name",   &VehicleType::name);
 	add("width",  &Loader::width);
 }
@@ -64,8 +78,8 @@ VehicleType::Axle::Loader::Loader(Axle &a):
 	DataFile::ObjectLoader<Axle>(a)
 {
 	add("position",       &Loader::position);
-	add("wheel_diameter", &Loader::wheel_diameter);
 	add("powered",        &Axle::powered);
+	add("wheel_diameter", &Loader::wheel_diameter);
 }
 
 void VehicleType::Axle::Loader::position(float p)
@@ -82,8 +96,10 @@ void VehicleType::Axle::Loader::wheel_diameter(float d)
 VehicleType::Bogie::Loader::Loader(Bogie &b):
 	DataFile::ObjectLoader<Bogie>(b)
 {
-	add("position", &Loader::position);
-	add("axle",     &Loader::axle);
+	add("axle",          &Loader::axle);
+	add("object",        &Bogie::object);
+	add("position",      &Loader::position);
+	add("rotate_object", &Bogie::rotate_object);
 }
 
 void VehicleType::Bogie::Loader::axle()