X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fvehicletype.cpp;h=973070ceafc158fe2fddfd4fb966115c5c1ca2a6;hb=5c1ddd2f213af3fea15237e02f7da112c0abba36;hp=2da44cc992f340f7c73e7f44e104fc4285327078;hpb=a993f204ba2cd282637814caec3ab115040fc0cc;p=r2c2.git

diff --git a/source/libr2c2/vehicletype.cpp b/source/libr2c2/vehicletype.cpp
index 2da44cc..973070c 100644
--- a/source/libr2c2/vehicletype.cpp
+++ b/source/libr2c2/vehicletype.cpp
@@ -8,7 +8,7 @@ using namespace Msp;
 namespace R2C2 {
 
 VehicleType::VehicleType(const ArticleNumber &an):
-	art_nr(an),
+	ObjectType(an),
 	locomotive(false),
 	swap_direction(false),
 	length(0),
@@ -105,7 +105,7 @@ VehicleType::Rod::Rod():
 
 
 VehicleType::Loader::Loader(VehicleType &vt):
-	DataFile::ObjectLoader<VehicleType>(vt)
+	DataFile::DerivedObjectLoader<VehicleType, ObjectType::Loader>(vt)
 {
 	add("axle",       &Loader::axle);
 	add("bogie",      &Loader::bogie);
@@ -113,7 +113,6 @@ VehicleType::Loader::Loader(VehicleType &vt):
 	add("height",     &Loader::height);
 	add("length",     &Loader::length);
 	add("locomotive", &VehicleType::locomotive);
-	add("name",       &VehicleType::name);
 	add("object",     &VehicleType::object);
 	add("rod",        &Loader::rod);
 	add("rotate_object", &VehicleType::rotate_object);