X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainproperties.cpp;h=efbf842c4ee10cc84368a850f42ff0738f443f8f;hb=3889ed84ee54c312436503f2fd1e328f4a2ba5e5;hp=bdd39fb97622f2e3c2f707ec892796abc0958ea2;hpb=378f04522aa762729c0d5651fb60ad7e4d8ba9f3;p=r2c2.git

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index bdd39fb..efbf842 100644
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -23,7 +23,7 @@ TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t
 	engineer(e),
 	train(t)
 {
-	set_size(200, 275);
+	set_size(250, 275);
 
 	GLtk::Label *label;
 	add(*(label = new GLtk::Label(res, "Train properties")));
@@ -35,9 +35,9 @@ TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t
 	add(*(drp_type = new GLtk::Dropdown(res)));
 	drp_type->set_geometry(GLtk::Geometry(60, geom.h-50, geom.w-70, 20));
 
-	const map<unsigned, VehicleType *> &vehs = engineer.get_catalogue().get_vehicles();
+	const Catalogue::VehicleMap &vehs = engineer.get_catalogue().get_vehicles();
 	unsigned n = 0;
-	for(map<unsigned, VehicleType *>::const_iterator i=vehs.begin(); i!=vehs.end(); ++i, ++n)
+	for(Catalogue::VehicleMap::const_iterator i=vehs.begin(); i!=vehs.end(); ++i)
 	{
 		if(!i->second->is_locomotive())
 			continue;
@@ -45,6 +45,8 @@ TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t
 		drp_type->append(format("%d %s", i->second->get_article_number(), i->second->get_name()));
 		if(train && i->second==&train->get_locomotive_type())
 			drp_type->set_selected_index(n);
+
+		++n;
 	}
 
 	add(*(ent_name = new GLtk::Entry(res)));
@@ -65,7 +67,7 @@ TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t
 	drp_new_vehicle->set_geometry(GLtk::Geometry(10, geom.h-230, geom.w-20, 20));
 	drp_new_vehicle->append("(new vehicle)");
 	drp_new_vehicle->set_selected_index(0);
-	for(map<unsigned, VehicleType *>::const_iterator i=vehs.begin(); i!=vehs.end(); ++i)
+	for(Catalogue::VehicleMap::const_iterator i=vehs.begin(); i!=vehs.end(); ++i)
 	{
 		if(i->second->is_locomotive())
 			continue;
@@ -124,8 +126,8 @@ void TrainProperties::new_vehicle_selected(unsigned n, const string &)
 
 const VehicleType &TrainProperties::get_vehicle_type(unsigned n, bool loco)
 {
-	const map<unsigned, VehicleType *> &vehs = engineer.get_catalogue().get_vehicles();
-	map<unsigned, VehicleType *>::const_iterator i = vehs.begin();
+	const Catalogue::VehicleMap &vehs = engineer.get_catalogue().get_vehicles();
+	Catalogue::VehicleMap::const_iterator i = vehs.begin();
 	while(i!=vehs.end())
 	{
 		if(i->second->is_locomotive()==loco)