Derive Collection3D from Msp::DataFile and get GL::Objects through it

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

diff --git a/source/3d/vehicletype.cpp b/source/3d/vehicletype.cpp
index 2ddd34db08cc4515753f1eeb3171acee973e57d2..27fb883a985241ef12b66ea8a4e56d5cff9f91b3 100644 (file)
--- a/source/3d/vehicletype.cpp
+++ b/source/3d/vehicletype.cpp
@@ -31,7 +31,7 @@ T get(const map<string, string> &params, const string &key, T def = T())
 
 namespace R2C2 {
 
-VehicleType3D::VehicleType3D(const Catalogue3D &c, const VehicleType &t):
+VehicleType3D::VehicleType3D(Catalogue3D &c, const VehicleType &t):
        catalogue(c),
        type(t),
        body_object(0),
@@ -144,10 +144,7 @@ GL::Object *VehicleType3D::get_object(const string &name)
                        }
                }
                else
-               {
-                       ptr = new GL::Object;
-                       DataFile::load(*ptr, name);
-               }
+                       return catalogue.get<GL::Object>(name);
        }
        return ptr;
 }