Add vehicles

[r2c2.git] / source / libmarklin / locotype.h

diff --git a/source/libmarklin/locotype.h b/source/libmarklin/locotype.h
index 5fd34d8c32f20d56d043075e7fa5dfd9d72ed985..8234c4f45d1e85a661462c9bf46b9319a9d01d21 100644 (file)
--- a/source/libmarklin/locotype.h
+++ b/source/libmarklin/locotype.h
@@ -8,14 +8,14 @@ Distributed under the GPL
 #ifndef LIBMARKLIN_LOCOTYPE_H_
 #define LIBMARKLIN_LOCOTYPE_H_
 
-#include <msp/datafile/loader.h>
+#include "vehicletype.h"
 
 namespace Marklin {
 
-class LocoType
+class LocoType: public VehicleType
 {
 public:
-       class Loader: public Msp::DataFile::BasicLoader<LocoType>
+       class Loader: public VehicleType::Loader
        {
        public:
                Loader(LocoType &);
@@ -30,8 +30,6 @@ private:
 
 public:
        LocoType(unsigned);
-       unsigned get_article_number() const { return art_nr; }
-       const std::string &get_name() const { return name; }
        unsigned get_max_function() const;
        const std::map<unsigned, std::string> &get_functions() const { return funcs; }
 };