X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcatalogue.cpp;h=ec3e95a7d00a2ed45c222a2932c9d5c66491d1ab;hb=f730acd5fa2b4f0d0185770ff7950ab814aec47c;hp=3fb314a404a5d2f19b4c3833dd26eca4946d1b81;hpb=3e3675f8d86b06cdea7df197dfe8866ffb285aec;p=r2c2.git

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 3fb314a..ec3e95a 100644
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -21,6 +21,8 @@ Catalogue::~Catalogue()
 {
 	for(TrackMap::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		delete i->second;
+	for(SignalMap::iterator i=signals.begin(); i!=signals.end(); ++i)
+		delete i->second;
 	for(VehicleMap::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
 		delete i->second;
 }
@@ -73,11 +75,9 @@ Catalogue::Loader::Loader(Catalogue &c):
 	add("rail_profile", &Loader::rail_profile);
 	add("scale", &Loader::scale);
 	add("signal", &Loader::signal);
-	add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
-	add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
+	add("track", &Loader::track);
 	add("track_technique", &Catalogue::track_technique);
-	add("vehicle", static_cast<void (Loader::*)(unsigned)>(&Loader::vehicle));
-	add("vehicle", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::vehicle));
+	add("vehicle", &Loader::vehicle);
 }
 
 void Catalogue::Loader::ballast_profile()
@@ -89,8 +89,8 @@ void Catalogue::Loader::gauge(float g)
 {
 	obj.gauge = g/1000;
 	obj.path_profile = Profile();
-	obj.path_profile.append_vertex(Vector(0.1*obj.gauge, 0), false);
-	obj.path_profile.append_vertex(Vector(-0.1*obj.gauge, 0), false);
+	obj.path_profile.append_vertex(Vector(0.1*obj.gauge, 0, 0), false);
+	obj.path_profile.append_vertex(Vector(-0.1*obj.gauge, 0, 0), false);
 }
 
 void Catalogue::Loader::layout()
@@ -118,11 +118,6 @@ void Catalogue::Loader::signal(ArticleNumber art_nr)
 	obj.add_signal(*sig.release());
 }
 
-void Catalogue::Loader::track(unsigned art_nr)
-{
-	track(ArticleNumber(art_nr));
-}
-
 void Catalogue::Loader::track(ArticleNumber art_nr)
 {
 	if(obj.tracks.count(art_nr))
@@ -133,11 +128,6 @@ void Catalogue::Loader::track(ArticleNumber art_nr)
 	obj.add_track(*trk.release());
 }
 
-void Catalogue::Loader::vehicle(unsigned art_nr)
-{
-	vehicle(ArticleNumber(art_nr));
-}
-
 void Catalogue::Loader::vehicle(ArticleNumber art_nr)
 {
 	if(obj.vehicles.count(art_nr))