X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2F3d%2Flayout.cpp;h=05c398d302a33b3fb22bcc968d82d90f21409abe;hb=6e5d36dbc3f1e4a221d424fa7d57b07998df67a8;hp=70c55096cfa91eed259b6be9ebd99ef701dfd88c;hpb=e5cd9e4fbc577036a0385c985b6b65df8218d0a2;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 70c5509..05c398d 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -38,30 +38,31 @@ Layout3D::Layout3D(Layout &l):
 Layout3D::~Layout3D()
 {
 	while(!tracks.empty())
-		delete tracks.front();
+		delete tracks.begin()->second;
 	while(!vehicles.empty())
-		delete vehicles.front();
+		delete vehicles.begin()->second;
 }
 
 void Layout3D::add_track(Track3D &t)
 {
-	tracks.push_back(&t);
+	if(tracks.count(&t.get_track()))
+		throw KeyError("Duplicate track");
+
+	tracks[&t.get_track()] = &t;
 }
 
 void Layout3D::remove_track(Track3D &t)
 {
-	list<Track3D *>::iterator i = find(tracks.begin(), tracks.end(), &t);
-	if(i!=tracks.end())
-		tracks.erase(i);
+	tracks.erase(&t.get_track());
 }
 
-Track3D &Layout3D::get_track(const Track &t) const
+Track3D &Layout3D::get_track(Track &t) const
 {
-	for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(&(*i)->get_track()==&t)
-			return **i;
+	TrackMap::const_iterator i = tracks.find(&t);
+	if(i==tracks.end())
+		throw KeyError("Unknown track");
 
-	throw KeyError("Unknown track");
+	return *i->second;
 }
 
 Track3D *Layout3D::pick_track(float x, float y, float size) const
@@ -102,23 +103,24 @@ Track3D *Layout3D::pick_track(float x, float y, float size) const
 
 void Layout3D::add_vehicle(Vehicle3D &v)
 {
-	vehicles.push_back(&v);
+	if(vehicles.count(&v.get_vehicle()))
+		throw KeyError("Duplicate vehicle");
+
+	vehicles[&v.get_vehicle()] = &v;
 }
 
 void Layout3D::remove_vehicle(Vehicle3D &v)
 {
-	list<Vehicle3D *>::iterator i = find(vehicles.begin(), vehicles.end(), &v);
-	if(i!=vehicles.end())
-		vehicles.erase(i);
+	vehicles.erase(&v.get_vehicle());
 }
 
-Vehicle3D &Layout3D::get_vehicle(const Vehicle &v) const
+Vehicle3D &Layout3D::get_vehicle(Vehicle &v) const
 {
-	for(list<Vehicle3D *>::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
-		if(&(*i)->get_vehicle()==&v)
-			return **i;
+	VehicleMap::const_iterator i = vehicles.find(&v);
+	if(i==vehicles.end())
+		throw KeyError("Unknown vehicle");
 
-	throw KeyError("Unknown vehicle");
+	return *i->second;
 }
 
 void Layout3D::track_added(Track &t)
@@ -128,12 +130,9 @@ void Layout3D::track_added(Track &t)
 
 void Layout3D::track_removed(Track &t)
 {
-	for(list<Track3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(&(*i)->get_track()==&t)
-		{
-			delete *i;
-			return;
-		}
+	TrackMap::iterator i = tracks.find(&t);
+	if(i!=tracks.end())
+		delete i->second;
 }
 
 void Layout3D::vehicle_added(Vehicle &v)