X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fcatalogue.h;h=c0c6674c2a028e9ae44adc76ffdbba92761306b8;hb=64340dad429ba4040538fc06b6882aabdb489925;hp=c8b006ab42820b8b7b786e3ca494292fed7874a3;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h
index c8b006a..c0c6674 100644
--- a/source/libr2c2/catalogue.h
+++ b/source/libr2c2/catalogue.h
@@ -1,15 +1,8 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef LIBR2C2_CATALOGUE_H_
 #define LIBR2C2_CATALOGUE_H_
 
 #include <map>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "articlenumber.h"
 #include "layout.h"
 #include "profile.h"
@@ -22,7 +15,7 @@ class VehicleType;
 class Catalogue
 {
 public:
-	class Loader: public Msp::DataFile::BasicLoader<Catalogue>
+	class Loader: public Msp::DataFile::ObjectLoader<Catalogue>
 	{
 	public:
 		Loader(Catalogue &);
@@ -50,6 +43,7 @@ private:
 	Profile rail_profile;
 	Profile ballast_profile;
 	Profile path_profile;
+	std::string track_technique;
 	TrackMap tracks;
 	VehicleMap vehicles;
 	Layout layout;
@@ -64,6 +58,7 @@ public:
 	const Profile &get_rail_profile() const { return rail_profile; }
 	const Profile &get_ballast_profile() const { return ballast_profile; }
 	const Profile &get_path_profile() const { return path_profile; }
+	const std::string &get_track_technique() const { return track_technique; }
 
 	void add_track(TrackType &);
 	const TrackType &get_track(const ArticleNumber &) const;