Replace various map lookups with functions from maputils.h

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

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 266c921cfdf55f9e09414061c96322fa7b724189..7fd0d4ddac4b112073374fc25f6d4f96284f29c1 100644 (file)
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -51,10 +51,7 @@ void Layout3D::get_bounds(Vector &minp, Vector &maxp) const
 
 void Layout3D::add_track(Track3D &t)
 {
-       if(tracks.count(&t.get_track()))
-               throw KeyError("Duplicate track");
-
-       tracks[&t.get_track()] = &t;
+       insert_unique(tracks, &t.get_track(), &t);
 }
 
 void Layout3D::remove_track(Track3D &t)
@@ -64,19 +61,12 @@ void Layout3D::remove_track(Track3D &t)
 
 Track3D &Layout3D::get_track(Track &t) const
 {
-       TrackMap::const_iterator i = tracks.find(&t);
-       if(i==tracks.end())
-               throw KeyError("Unknown track");
-
-       return *i->second;
+       return *get_item(tracks, &t);
 }
 
 void Layout3D::add_vehicle(Vehicle3D &v)
 {
-       if(vehicles.count(&v.get_vehicle()))
-               throw KeyError("Duplicate vehicle");
-
-       vehicles[&v.get_vehicle()] = &v;
+       insert_unique(vehicles, &v.get_vehicle(), &v);
 }
 
 void Layout3D::remove_vehicle(Vehicle3D &v)
@@ -86,11 +76,7 @@ void Layout3D::remove_vehicle(Vehicle3D &v)
 
 Vehicle3D &Layout3D::get_vehicle(Vehicle &v) const
 {
-       VehicleMap::const_iterator i = vehicles.find(&v);
-       if(i==vehicles.end())
-               throw KeyError("Unknown vehicle");
-
-       return *i->second;
+       return *get_item(vehicles, &v);
 }
 
 void Layout3D::track_added(Track &t)