X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Flocotype.cpp;h=c00f7d3a94deda2c2586d4f66b080c1a71367ca0;hb=3133b97af17c8a11fb3364453b53d970790a1426;hp=7a1becf35ac5152db6d926a1c73673ed271ea895;hpb=e95240551e3c34d2fb21e99c358fa5922a2060c9;p=r2c2.git diff --git a/source/libmarklin/locotype.cpp b/source/libmarklin/locotype.cpp index 7a1becf..c00f7d3 100644 --- a/source/libmarklin/locotype.cpp +++ b/source/libmarklin/locotype.cpp @@ -12,7 +12,7 @@ using namespace std; namespace Marklin { LocoType::LocoType(unsigned an): - art_nr(an) + VehicleType(an) { } unsigned LocoType::get_max_function() const @@ -24,15 +24,14 @@ unsigned LocoType::get_max_function() const LocoType::Loader::Loader(LocoType <): - Msp::DataFile::BasicLoader(lt) + VehicleType::Loader(lt) { add("function", &Loader::function); - add("name", &LocoType::name); } void LocoType::Loader::function(unsigned i, const string &f) { - obj.funcs[i] = f; + static_cast(obj).funcs[i] = f; } } // namespace Marklin