X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fvehicletype.h;h=841664e375f10f61b079b52a535318c79cd4ea76;hb=0c2a3e6c435fd4cf05cc5275f750d341842aa543;hp=d9afdbce8c00aa60f4e32e224c782176cd239b22;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/libr2c2/vehicletype.h b/source/libr2c2/vehicletype.h
index d9afdbc..841664e 100644
--- a/source/libr2c2/vehicletype.h
+++ b/source/libr2c2/vehicletype.h
@@ -2,15 +2,15 @@
 #define LIBR2C2_VEHICLETYPE_H_
 
 #include <msp/datafile/objectloader.h>
-#include "articlenumber.h"
 #include "geometry.h"
+#include "objecttype.h"
 
 namespace R2C2 {
 
-class VehicleType
+class VehicleType: public ObjectType
 {
 public:
-	class Loader: public Msp::DataFile::ObjectLoader<VehicleType>
+	class Loader: public Msp::DataFile::DerivedObjectLoader<VehicleType, ObjectType::Loader>
 	{
 	private:
 		std::map<std::string, unsigned> rod_tags;
@@ -125,8 +125,6 @@ public:
 	typedef std::map<unsigned, std::string> FunctionMap;
 
 private:
-	ArticleNumber art_nr;
-	std::string name;
 	bool locomotive;
 	FunctionMap functions;
 	bool swap_direction;
@@ -137,12 +135,11 @@ private:
 	BogieArray bogies;
 	RodArray rods;
 	std::string object;
+	bool rotate_object;
 
 public:
 	VehicleType(const ArticleNumber &);
 
-	const ArticleNumber &get_article_number() const { return art_nr; }
-	const std::string &get_name() const { return name; }
 	bool is_locomotive() const { return locomotive; }
 	unsigned get_max_function() const;
 	const FunctionMap &get_functions() const { return functions; }
@@ -160,6 +157,7 @@ public:
 	float get_front_axle_offset() const;
 	float get_back_axle_offset() const;
 	const std::string &get_object() const { return object; }
+	bool get_rotate_object() const { return rotate_object; }
 };
 
 } // namespace R2C2