X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fcatalogue.cpp;h=2f4fc04ded6ee6923322691354ebcba03c595334;hb=9abaa89f495307c7e90cbef51ae0fedbaff001db;hp=1068feafdfa87a1933c538e06d5921049107a9b5;hpb=e5cd9e4fbc577036a0385c985b6b65df8218d0a2;p=r2c2.git

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 1068fea..2f4fc04 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -6,7 +6,6 @@ Distributed under the GPL
 */
 
 #include <msp/gl/meshbuilder.h>
-#include "libmarklin/locotype.h"
 #include "catalogue.h"
 #include "tracktype.h"
 #include "vehicletype.h"
@@ -21,10 +20,10 @@ Catalogue3D::Catalogue3D(Catalogue &c):
 	endpoint_mesh((GL::NORMAL3, GL::VERTEX3))
 {
 	catalogue.signal_track_added.connect(sigc::mem_fun(this, &Catalogue3D::track_added));
-	catalogue.signal_loco_added.connect(sigc::mem_fun(this, &Catalogue3D::loco_added));
+	catalogue.signal_vehicle_added.connect(sigc::mem_fun(this, &Catalogue3D::vehicle_added));
 
-	const map<unsigned, TrackType *> &trks = catalogue.get_tracks();
-	for(map<unsigned, TrackType *>::const_iterator i=trks.begin(); i!=trks.end(); ++i)
+	const Catalogue::TrackMap &trks = catalogue.get_tracks();
+	for(Catalogue::TrackMap::const_iterator i=trks.begin(); i!=trks.end(); ++i)
 		track_added(*i->second);
 
 	ballast_material.set_diffuse(GL::Color(0.25, 0.25, 0.25));
@@ -37,6 +36,8 @@ Catalogue3D::~Catalogue3D()
 {
 	for(map<const TrackType *, TrackType3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		delete i->second;
+	for(map<const VehicleType *, VehicleType3D *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+		delete i->second;
 }
 
 const TrackType3D &Catalogue3D::get_track(const TrackType &tt) const
@@ -62,9 +63,9 @@ void Catalogue3D::track_added(const TrackType &track)
 	tracks[&track] = new TrackType3D(*this, track);
 }
 
-void Catalogue3D::loco_added(const LocoType &loco)
+void Catalogue3D::vehicle_added(const VehicleType &veh)
 {
-	vehicles[&loco] = new VehicleType3D(*this, loco);
+	vehicles[&veh] = new VehicleType3D(*this, veh);
 }
 
 void Catalogue3D::build_endpoint_mesh()