Support trains with multiple vehicles

[r2c2.git] / source / libmarklin / catalogue.h

diff --git a/source/libmarklin/catalogue.h b/source/libmarklin/catalogue.h
index 61a336f5f6c2e7441f6cb05cd38aa934b54e8734..524d3f2b56a6593cb82c859af044dfbf027838d9 100644 (file)
--- a/source/libmarklin/catalogue.h
+++ b/source/libmarklin/catalogue.h
@@ -34,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;
@@ -46,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:
@@ -63,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; }
 };