Clear the critical flag one track earlier

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

diff --git a/source/3d/vehicletype.h b/source/3d/vehicletype.h
index 81a6468b81622470a5605f87f86e71a7f2a0df6e..428a372f58ca313a729df93c21e01ba60f0ef95e 100644 (file)
--- a/source/3d/vehicletype.h
+++ b/source/3d/vehicletype.h
@@ -1,18 +1,16 @@
-#ifndef LIBR2C23D_VEHICLETYPE_H_
-#define LIBR2C23D_VEHICLETYPE_H_
+#ifndef R2C2_3D_VEHICLETYPE_H_
+#define R2C2_3D_VEHICLETYPE_H_
 
 #include <msp/gl/mesh.h>
 #include <msp/gl/object.h>
 #include "libr2c2/vehicletype.h"
+#include "objecttype.h"
 
 namespace R2C2 {
 
-class Catalogue3D;
-
-class VehicleType3D
+class VehicleType3D: public ObjectType3D
 {
 private:
-       Catalogue3D &catalogue;
        const VehicleType &type;
        std::map<std::string, Msp::GL::Object *> objects;
        Msp::GL::Object *body_object;