Move track appearance properties into a separate class

[r2c2.git] / source / libr2c2 / catalogue.cpp

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 779e210b1375ad1e4bb09055e7251a33f9194fa2..2fdc21c08cb482667b08162d81535d8d1bb7c1d6 100644 (file)
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -24,11 +24,6 @@ Catalogue::~Catalogue()
                delete i->second;
 }
 
-float Catalogue::get_rail_elevation() const
-{
-       return ballast_profile.get_height()+rail_profile.get_height();
-}
-
 void Catalogue::add(ObjectType &object)
 {
        insert_unique(objects, object.get_article_number(), &object);
@@ -44,23 +39,16 @@ const ObjectType &Catalogue::get(const ArticleNumber &art_nr) const
 Catalogue::Loader::Loader(Catalogue &c):
        DataFile::ObjectLoader<Catalogue>(c)
 {
-       add("ballast_profile", &Loader::ballast_profile);
        add("gauge", &Loader::gauge);
        add("layout", &Loader::layout);
-       add("rail_profile", &Loader::rail_profile);
        add("scale", &Loader::scale);
        add("signal", &Loader::signal);
        add("terrain", &Loader::terrain);
        add("track", &Loader::track);
-       add("track_technique", &Catalogue::track_technique);
+       add("track_appearance", &Loader::track_appearance);
        add("vehicle", &Loader::vehicle);
 }
 
-void Catalogue::Loader::ballast_profile()
-{
-       load_sub(obj.ballast_profile);
-}
-
 void Catalogue::Loader::gauge(float g)
 {
        obj.gauge = g/1000;
@@ -71,11 +59,6 @@ void Catalogue::Loader::layout()
        load_sub(obj.layout);
 }
 
-void Catalogue::Loader::rail_profile()
-{
-       load_sub(obj.rail_profile);
-}
-
 void Catalogue::Loader::scale(float n, float d)
 {
        obj.scale = n/d;
@@ -106,11 +89,16 @@ void Catalogue::Loader::track(ArticleNumber art_nr)
        if(obj.objects.count(art_nr))
                throw key_error(art_nr);
 
-       RefPtr<TrackType> trk = new TrackType(art_nr);
+       RefPtr<TrackType> trk = new TrackType(art_nr, obj.appearance);
        load_sub(*trk);
        obj.add(*trk.release());
 }
 
+void Catalogue::Loader::track_appearance()
+{
+       load_sub(obj.appearance);
+}
+
 void Catalogue::Loader::vehicle(ArticleNumber art_nr)
 {
        if(obj.objects.count(art_nr))