Rename the project to R²C²

[r2c2.git] / source / 3d / catalogue.cpp

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index 57bf0533918d67f7ac95d101d1896aa6f3d727f6..8641013fe3559256a052644267aaf77d7e0869b7 100644 (file)
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -13,7 +13,7 @@ Distributed under the GPL
 using namespace std;
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Catalogue3D::Catalogue3D(Catalogue &c):
        catalogue(c),
@@ -22,8 +22,8 @@ Catalogue3D::Catalogue3D(Catalogue &c):
        catalogue.signal_track_added.connect(sigc::mem_fun(this, &Catalogue3D::track_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));
@@ -36,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
@@ -91,4 +93,4 @@ void Catalogue3D::build_endpoint_mesh()
        bld.end();
 }
 
-} // namespace Marklin
+} // namespace R2C2