Store all axles in a single array

[r2c2.git] / source / 3d / vehicle.cpp

diff --git a/source/3d/vehicle.cpp b/source/3d/vehicle.cpp
index b7cec4439cd8ce42163eaf255d9b799136cf7f3a..9d0f3e88dc4203e8b497b02f01e27d6b1ef131a7 100644 (file)
--- a/source/3d/vehicle.cpp
+++ b/source/3d/vehicle.cpp
@@ -19,23 +19,16 @@ Vehicle3D::Vehicle3D(Layout3D &l, Vehicle &v):
        vehicle(v),
        type(layout.get_catalogue().get_vehicle(vehicle.get_type()))
 {
-       unsigned n_axles = vehicle.get_type().get_fixed_axles().size();
+       unsigned n_axles = vehicle.get_type().get_axles().size();
        for(unsigned i=0; i<n_axles; ++i)
-               if(type.get_fixed_axle_object(i))
+               if(type.get_axle_object(i))
                        children.push_back(new Axle3D(*this, i));
 
        unsigned n_bogies = vehicle.get_type().get_bogies().size();
        for(unsigned i=0; i<n_bogies; ++i)
                if(type.get_bogie_object(i))
-               {
                        children.push_back(new Bogie3D(*this, i));
 
-                       n_axles = vehicle.get_type().get_bogie(i).axles.size();
-                       for(unsigned j=0; j<n_axles; ++j)
-                               if(type.get_bogie_axle_object(i, j))
-                                       children.push_back(new Axle3D(*this, i, j));
-               }
-
        unsigned n_rods = vehicle.get_type().get_rods().size();
        for(unsigned i=0; i<n_rods; ++i)
                if(type.get_rod_object(i))