X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=598bf82bcf4c0a1763a22d9b78562b21c4d6e00e;hb=cf38d0a8208fab7ba7aaafc5eed9a86dfc3722a5;hp=f318958879ba16049741222428fa8cc32412de34;hpb=710efe5438a585b071085fc7d7ea14aebd8328fd;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index f318958..598bf82 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -555,13 +555,13 @@ void Layout::Loader::route()
 
 void Layout::Loader::signal(ArticleNumber art_nr)
 {
-	Signal *sig = new Signal(obj, obj.catalogue.get_signal(art_nr));
+	Signal *sig = new Signal(obj, obj.catalogue.get<SignalType>(art_nr));
 	load_sub(*sig);
 }
 
 void Layout::Loader::track(ArticleNumber art_nr)
 {
-	Track *trk = new Track(obj, obj.catalogue.get_track(art_nr));
+	Track *trk = new Track(obj, obj.catalogue.get<TrackType>(art_nr));
 	load_sub(*trk);
 	new_tracks = true;
 	const set<Track *> &tracks = obj.objects.get<Track>();
@@ -572,7 +572,7 @@ void Layout::Loader::track(ArticleNumber art_nr)
 
 void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::string &proto)
 {
-	Train *trn = new Train(obj, obj.catalogue.get_vehicle(art_nr), addr, proto);
+	Train *trn = new Train(obj, obj.catalogue.get<VehicleType>(art_nr), addr, proto);
 	load_sub(*trn);
 }