X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcatalogue.cpp;h=a919cb76a64d7ff34a8c780d96122c1140597910;hb=b860a56bd9bc8894311c02d7673f379beff3220b;hp=2afe4eaa14885cee663de30af2475648e9486ab4;hpb=11c68656ac53318801dcb36078509a07ae2c2a94;p=r2c2.git

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 2afe4ea..a919cb7 100644
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -16,10 +16,10 @@ Catalogue::Catalogue():
 	scale(1),
 	layout(*this)
 {
-	add_type<TrackType>();
-	add_type<SignalType>();
-	add_type<VehicleType>();
-	add_type<TerrainType>();
+	add_type<TrackType>().keyword("track");
+	add_type<SignalType>().keyword("signal");
+	add_type<VehicleType>().keyword("vehicle");
+	add_type<TerrainType>().keyword("terrain");
 	add_type<TrackAppearance>().keyword("track_appearance");
 }
 
@@ -30,10 +30,6 @@ Catalogue::Loader::Loader(Catalogue &c):
 {
 	add("layout", &Loader::layout);
 	add("scale", &Loader::scale);
-	add("signal", &Loader::signal);
-	add("terrain", &Loader::terrain);
-	add("track", &Loader::track);
-	add("vehicle", &Loader::vehicle);
 }
 
 void Catalogue::Loader::layout()
@@ -46,36 +42,4 @@ void Catalogue::Loader::scale(float n, float d)
 	cat.scale = n/d;
 }
 
-void Catalogue::Loader::signal(const string &n)
-{
-	RefPtr<SignalType> sig = new SignalType(n);
-	load_sub(*sig);
-	cat.add(n, sig.get());
-	sig.release();
-}
-
-void Catalogue::Loader::terrain(const string &n)
-{
-	RefPtr<TerrainType> ter = new TerrainType(n);
-	load_sub(*ter);
-	cat.add(n, ter.get());
-	ter.release();
-}
-
-void Catalogue::Loader::track(const string &n)
-{
-	RefPtr<TrackType> trk = new TrackType(n);
-	load_sub(*trk, cat);
-	cat.add(n, trk.get());
-	trk.release();
-}
-
-void Catalogue::Loader::vehicle(const string &n)
-{
-	RefPtr<VehicleType> veh = new VehicleType(n);
-	load_sub(*veh);
-	cat.add(n, veh.get());
-	veh.release();
-}
-
 } // namespace R2C2