X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Flocotype.cpp;h=c00f7d3a94deda2c2586d4f66b080c1a71367ca0;hb=4d33c389881ebdf0b3926343d53e7d1ece654e20;hp=bfb7bc301feb180785d5c34fca2715efa73e1c0f;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/libmarklin/locotype.cpp b/source/libmarklin/locotype.cpp
index bfb7bc3..c00f7d3 100644
--- a/source/libmarklin/locotype.cpp
+++ b/source/libmarklin/locotype.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -12,20 +12,26 @@ using namespace std;
 namespace Marklin {
 
 LocoType::LocoType(unsigned an):
-	art_nr(an)
+	VehicleType(an)
 { }
 
+unsigned LocoType::get_max_function() const
+{
+	if(funcs.empty())
+		return 0;
+	return (--funcs.end())->first;
+}
+
 
 LocoType::Loader::Loader(LocoType &lt):
-	ltype(lt)
+	VehicleType::Loader(lt)
 {
 	add("function", &Loader::function);
-	add("name",     &LocoType::name);
 }
 
 void LocoType::Loader::function(unsigned i, const string &f)
 {
-	ltype.funcs[i]=f;
+	static_cast<LocoType &>(obj).funcs[i] = f;
 }
 
 } // namespace Marklin