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

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index cfd5d64..2afe4ea 100644
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -20,6 +20,7 @@ Catalogue::Catalogue():
 	add_type<SignalType>();
 	add_type<VehicleType>();
 	add_type<TerrainType>();
+	add_type<TrackAppearance>().keyword("track_appearance");
 }
 
 
@@ -32,7 +33,6 @@ Catalogue::Loader::Loader(Catalogue &c):
 	add("signal", &Loader::signal);
 	add("terrain", &Loader::terrain);
 	add("track", &Loader::track);
-	add("track_appearance", &Loader::track_appearance);
 	add("vehicle", &Loader::vehicle);
 }
 
@@ -64,17 +64,12 @@ void Catalogue::Loader::terrain(const string &n)
 
 void Catalogue::Loader::track(const string &n)
 {
-	RefPtr<TrackType> trk = new TrackType(n, &cat.appearance);
-	load_sub(*trk);
+	RefPtr<TrackType> trk = new TrackType(n);
+	load_sub(*trk, cat);
 	cat.add(n, trk.get());
 	trk.release();
 }
 
-void Catalogue::Loader::track_appearance()
-{
-	load_sub(cat.appearance);
-}
-
 void Catalogue::Loader::vehicle(const string &n)
 {
 	RefPtr<VehicleType> veh = new VehicleType(n);