Redesign the train activation system

[r2c2.git] / source / libr2c2 / vehicletype.cpp

diff --git a/source/libr2c2/vehicletype.cpp b/source/libr2c2/vehicletype.cpp
index 720b922a183a911bef72f9b916243a0bc1d9a63e..973070ceafc158fe2fddfd4fb966115c5c1ca2a6 100644 (file)
--- a/source/libr2c2/vehicletype.cpp
+++ b/source/libr2c2/vehicletype.cpp
@@ -8,12 +8,13 @@ using namespace Msp;
 namespace R2C2 {
 
 VehicleType::VehicleType(const ArticleNumber &an):
-       art_nr(an),
+       ObjectType(an),
        locomotive(false),
        swap_direction(false),
        length(0),
        width(0),
-       height(0)
+       height(0),
+       rotate_object(false)
 { }
 
 unsigned VehicleType::get_max_function() const
@@ -104,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);
@@ -112,9 +113,9 @@ 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);
        add("swap_direction", &VehicleType::swap_direction);
        add("width",      &Loader::width);
 }