Replace various map lookups with functions from maputils.h

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

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index f4e4fd04a4a4eb0b4736cb6ff3d355a7bb7a6dec..8d31219eb24dfabc1c718457be7db9fda7c5ac76 100644 (file)
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -42,20 +42,12 @@ Catalogue3D::~Catalogue3D()
 
 const TrackType3D &Catalogue3D::get_track(const TrackType &tt) const
 {
-       map<const TrackType *, TrackType3D *>::const_iterator i = tracks.find(&tt);
-       if(i==tracks.end())
-               throw KeyError("Unknown track type");
-
-       return *i->second;
+       return *get_item(tracks, &tt);
 }
 
 const VehicleType3D &Catalogue3D::get_vehicle(const VehicleType &vt) const
 {
-       map<const VehicleType *, VehicleType3D *>::const_iterator i = vehicles.find(&vt);
-       if(i==vehicles.end())
-               throw KeyError("Unknown vehicle type");
-
-       return *i->second;
+       return *get_item(vehicles, &vt);
 }
 
 void Catalogue3D::track_added(const TrackType &track)