X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fvehicletype.h;h=7844825ea17111188e6c560475c9afffcf1d5e0c;hb=30df355287abd0bfe1189e616056335505287e9a;hp=082e3bc1e2167e3a66a0e10147b677b94028e210;hpb=d01230572abde870055844b6efaa777a2ba93226;p=r2c2.git

diff --git a/source/libmarklin/vehicletype.h b/source/libmarklin/vehicletype.h
index 082e3bc..7844825 100644
--- a/source/libmarklin/vehicletype.h
+++ b/source/libmarklin/vehicletype.h
@@ -9,6 +9,7 @@ Distributed under the GPL
 #define LIBMARKLIN_VEHICLETYPE_H_
 
 #include <msp/datafile/objectloader.h>
+#include "articlenumber.h"
 
 namespace Marklin {
 
@@ -42,6 +43,7 @@ public:
 		float position;
 		float wheel_dia;
 		bool powered;
+		std::string object;
 
 		Axle();
 	};
@@ -66,7 +68,7 @@ public:
 	};
 
 private:
-	unsigned art_nr;
+	ArticleNumber art_nr;
 	std::string name;
 	bool locomotive;
 	std::map<unsigned, std::string> functions;
@@ -78,9 +80,9 @@ private:
 	std::string object;
 
 public:
-	VehicleType(unsigned);
+	VehicleType(const ArticleNumber &);
 
-	unsigned get_article_number() const { return art_nr; }
+	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;