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

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index f318958..c2de1c5 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -528,8 +528,7 @@ void Layout::Storage<B>::del()
 
 
 Layout::Loader::Loader(Layout &l):
-	DataFile::ObjectLoader<Layout>(l),
-	new_tracks(false)
+	DataFile::ObjectLoader<Layout>(l)
 {
 	add("base",  &Layout::base);
 	add("beamgate", &Loader::beamgate);
@@ -555,15 +554,14 @@ 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>();
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		if(*i!=trk)
@@ -572,7 +570,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);
 }