Support more complex article numbers

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

diff --git a/source/libmarklin/layout.cpp b/source/libmarklin/layout.cpp
index 338612a104e24a94567430084e61a6e0e3e4cd88..25568d6e6fb23d51e86ad003cf36d12c466314b9 100644 (file)
--- a/source/libmarklin/layout.cpp
+++ b/source/libmarklin/layout.cpp
@@ -296,8 +296,10 @@ Layout::Loader::Loader(Layout &l):
        add("base",  &Layout::base);
        add("route", static_cast<void (Loader::*)()>(&Loader::route));
        add("route", static_cast<void (Loader::*)(const string &)>(&Loader::route));
-       add("track", &Loader::track);
-       add("train", &Loader::train);
+       add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
+       add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
+       add("train", static_cast<void (Loader::*)(unsigned, unsigned)>(&Loader::train));
+       add("train", static_cast<void (Loader::*)(ArticleNumber, unsigned)>(&Loader::train));
 }
 
 void Layout::Loader::finish()
@@ -320,6 +322,11 @@ void Layout::Loader::route(const string &n)
 }
 
 void Layout::Loader::track(unsigned art_nr)
+{
+       track(ArticleNumber(art_nr));
+}
+
+void Layout::Loader::track(ArticleNumber art_nr)
 {
        Track *trk = new Track(obj, obj.catalogue.get_track(art_nr));
        load_sub(*trk);
@@ -330,6 +337,11 @@ void Layout::Loader::track(unsigned art_nr)
 }
 
 void Layout::Loader::train(unsigned art_nr, unsigned addr)
+{
+       train(ArticleNumber(art_nr), addr);
+}
+
+void Layout::Loader::train(ArticleNumber art_nr, unsigned addr)
 {
        Train *trn = new Train(obj, obj.catalogue.get_vehicle(art_nr), addr);
        load_sub(*trn);