]> git.tdb.fi Git - r2c2.git/blobdiff - source/3d/catalogue.cpp
Fix remaining exception class names
[r2c2.git] / source / 3d / catalogue.cpp
index f4e4fd04a4a4eb0b4736cb6ff3d355a7bb7a6dec..7169c60c3272be579162ec093fdbd1c5672a764e 100644 (file)
@@ -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)
@@ -102,7 +94,7 @@ FS::Path Catalogue3D::locate_file(const string &name)
        if(FS::exists(path))
                return path;
 
-       throw Exception("Can't locate "+name);
+       throw runtime_error("Can't locate "+name);
 }
 
 template<typename T>