Convert Catalogue to a Collection

[r2c2.git] / source / engineer / newvehicledialog.cpp

diff --git a/source/engineer/newvehicledialog.cpp b/source/engineer/newvehicledialog.cpp
index f27370fe093bdba68228ddc843c5d7c0bb9feef3..e9c537ee0c21f8b0a73a8b665ea542752a5a250c 100644 (file)
--- a/source/engineer/newvehicledialog.cpp
+++ b/source/engineer/newvehicledialog.cpp
@@ -37,13 +37,13 @@ NewVehicleDialog::NewVehicleDialog(Train &t):
 
        dynamic_cast<GLtk::Button *>(get_item(widgets, "btn_add"))->signal_clicked.connect(sigc::mem_fun(this, &NewVehicleDialog::add_clicked));
 
-       const Catalogue::VehicleMap &cat_vtypes = train.get_layout().get_catalogue().get_vehicles();
-       for(Catalogue::VehicleMap::const_iterator i=cat_vtypes.begin(); i!=cat_vtypes.end(); ++i)
+       list<VehicleType *> veh_types = train.get_layout().get_catalogue().get_list<VehicleType>();
+       for(list<VehicleType *>::iterator i=veh_types.begin(); i!=veh_types.end(); ++i)
        {
-               if(i->second->is_locomotive())
-                       loco_types.append(i->second);
+               if((*i)->is_locomotive())
+                       loco_types.append(*i);
                else
-                       wagon_types.append(i->second);
+                       wagon_types.append(*i);
        }
 }