X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fcatalogue.h;h=524d3f2b56a6593cb82c859af044dfbf027838d9;hb=4d33c389881ebdf0b3926343d53e7d1ece654e20;hp=f1654a19d62add8b8f5c31fdd95295acb837e10b;hpb=90790c9a28793d31b9ea38eea2f55652a0e9297b;p=r2c2.git

diff --git a/source/libmarklin/catalogue.h b/source/libmarklin/catalogue.h
index f1654a1..524d3f2 100644
--- a/source/libmarklin/catalogue.h
+++ b/source/libmarklin/catalogue.h
@@ -17,6 +17,7 @@ namespace Marklin {
 
 class LocoType;
 class TrackType;
+class VehicleType;
 
 class Catalogue
 {
@@ -33,10 +34,11 @@ public:
 		void rail_profile();
 		void scale(float, float);
 		void track(unsigned);
+		void vehicle(unsigned);
 	};
 
 	sigc::signal<void, const TrackType &> signal_track_added;
-	sigc::signal<void, const LocoType &> signal_loco_added;
+	sigc::signal<void, const VehicleType &> signal_vehicle_added;
 
 private:
 	float scale;
@@ -45,7 +47,7 @@ private:
 	Profile ballast_profile;
 	Profile path_profile;
 	std::map<unsigned, TrackType *> tracks;
-	std::map<unsigned, LocoType *> locos;
+	std::map<unsigned, VehicleType *> vehicles;
 	Layout layout;
 
 public:
@@ -62,9 +64,10 @@ public:
 	const TrackType &get_track(unsigned) const;
 	const std::map<unsigned, TrackType *> &get_tracks() const { return tracks; }
 
-	void add_locomotive(LocoType &);
+	void add_vehicle(VehicleType &);
+	const VehicleType &get_vehicle(unsigned) const;
 	const LocoType &get_locomotive(unsigned) const;
-	const std::map<unsigned, LocoType *> &get_locomotives() const { return locos; }
+	const std::map<unsigned, VehicleType *> &get_vehicles() const { return vehicles; }
 
 	Layout &get_layout() { return layout; }
 };