Rework article numbers

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

diff --git a/source/libr2c2/vehicletype.cpp b/source/libr2c2/vehicletype.cpp
index 7200b99ec1d71518dcdded13484dab409b35e9ce..59787455e3cf1a6c7e81da4bd076b09b4de7377b 100644 (file)
--- a/source/libr2c2/vehicletype.cpp
+++ b/source/libr2c2/vehicletype.cpp
@@ -10,14 +10,15 @@ using namespace Msp;
 
 namespace R2C2 {
 
-VehicleType::VehicleType(const ArticleNumber &an):
-       ObjectType(an),
+VehicleType::VehicleType():
        locomotive(false),
        swap_direction(false),
+       gauge(1.524),
        length(0),
        width(0),
        height(0),
-       rotate_object(false)
+       rotate_object(false),
+       max_speed(0)
 { }
 
 unsigned VehicleType::get_max_function() const
@@ -106,9 +107,11 @@ VehicleType::Loader::Loader(VehicleType &vt):
        add("axle",       &Loader::axle);
        add("bogie",      &Loader::bogie);
        add("function",   &Loader::function);
+       add("gauge",      &Loader::gauge);
        add("height",     &Loader::height);
        add("length",     &Loader::length);
        add("locomotive", &VehicleType::locomotive);
+       add("maximum_speed", &VehicleType::max_speed);
        add("mirror_rods", &Loader::mirror_rods);
        add("object",     &VehicleType::object);
        add("rod",        &Loader::rod);
@@ -166,6 +169,11 @@ void VehicleType::Loader::function(unsigned i, const string &f)
        obj.functions[i] = f;
 }
 
+void VehicleType::Loader::gauge(float g)
+{
+       obj.gauge = g/1000;
+}
+
 void VehicleType::Loader::height(float h)
 {
        obj.height = h/1000;