X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcatalogue.h;h=92d1149f1f4162a0030857782af9b95f472cc310;hb=5929b101ee38b5668b328e7b1eac4bf49c912412;hp=dcde9f38f9600dfac5a2a7f761e72ec0c54738c5;hpb=7c98e23312cf01ce1fa6c1ffd8e36c22d2fa6110;p=r2c2.git

diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h
index dcde9f3..92d1149 100644
--- a/source/libr2c2/catalogue.h
+++ b/source/libr2c2/catalogue.h
@@ -5,7 +5,7 @@
 #include <msp/datafile/objectloader.h>
 #include "articlenumber.h"
 #include "layout.h"
-#include "profile.h"
+#include "trackappearance.h"
 
 namespace R2C2 {
 
@@ -19,13 +19,12 @@ public:
 	public:
 		Loader(Catalogue &);
 	private:
-		void ballast_profile();
-		void gauge(float);
 		void layout();
-		void rail_profile();
 		void scale(float, float);
 		void signal(ArticleNumber);
+		void terrain(ArticleNumber);
 		void track(ArticleNumber);
+		void track_appearance();
 		void vehicle(ArticleNumber);
 	};
 
@@ -35,10 +34,7 @@ public:
 
 private:
 	float scale;
-	float gauge;
-	Profile rail_profile;
-	Profile ballast_profile;
-	std::string track_technique;
+	TrackAppearance appearance;
 	ObjectMap objects;
 	Layout layout;
 
@@ -47,11 +43,6 @@ public:
 	~Catalogue();
 
 	float get_scale() const { return scale; }
-	float get_gauge() const { return gauge; }
-	float get_rail_elevation() const;
-	const Profile &get_rail_profile() const { return rail_profile; }
-	const Profile &get_ballast_profile() const { return ballast_profile; }
-	const std::string &get_track_technique() const { return track_technique; }
 
 	void add(ObjectType &);
 	const ObjectType &get(const ArticleNumber &) const;