Implement train priority system

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

diff --git a/source/libmarklin/locotype.cpp b/source/libmarklin/locotype.cpp
index bfb7bc301feb180785d5c34fca2715efa73e1c0f..c00f7d3a94deda2c2586d4f66b080c1a71367ca0 100644 (file)
--- 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