X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fvehicletype.h;h=428a372f58ca313a729df93c21e01ba60f0ef95e;hb=2fb2e58685c521ea76aab9f6d7cffe1186c9814a;hp=81a6468b81622470a5605f87f86e71a7f2a0df6e;hpb=bc9e941447da48905295192289bc09483a678180;p=r2c2.git

diff --git a/source/3d/vehicletype.h b/source/3d/vehicletype.h
index 81a6468..428a372 100644
--- 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;