X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Frouteselect.cpp;h=3413220a46aea4c8cac349230c29cdc486cd7850;hb=02c9a9779954d993cb73fe5f7a72b0847e87f633;hp=8b526aeab75b80fdb42613c0ce90346c0cea2dab;hpb=7587f018794f53974409a2aad76a0a421cea2d24;p=r2c2.git

diff --git a/source/engineer/routeselect.cpp b/source/engineer/routeselect.cpp
index 8b526ae..3413220 100644
--- a/source/engineer/routeselect.cpp
+++ b/source/engineer/routeselect.cpp
@@ -30,12 +30,12 @@ RouteSelect::RouteSelect(Engineer &e, const GLtk::Resources &r, Train &t):
 	drp_route->set_geometry(GLtk::Geometry(10, geom.h-50, geom.w-20, 20));
 	drp_route->append("(none)");
 	drp_route->set_selected_index(0);
-	const set<Route *> &routes = engineer.get_layout().get_routes();
+	const map<string, Route *> &routes = engineer.get_layout().get_routes();
 	unsigned n = 1;
-	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i, ++n)
+	for(map<string, Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i, ++n)
 	{
-		drp_route->append((*i)->get_name());
-		if(*i==train.get_route())
+		drp_route->append(i->second->get_name());
+		if(i->second==train.get_route())
 			drp_route->set_selected_index(n);
 	}
 }
@@ -44,11 +44,11 @@ void RouteSelect::on_ok_clicked()
 {
 	if(drp_route->get_selected_index()>0)
 	{
-		const set<Route *> &routes = engineer.get_layout().get_routes();
-		set<Route *>::const_iterator i = routes.begin();
+		const map<string, Route *> &routes = engineer.get_layout().get_routes();
+		map<string, Route *>::const_iterator i = routes.begin();
 		advance(i, drp_route->get_selected_index()-1);
 		
-		train.set_route(*i);
+		train.set_route(i->second);
 	}
 	else
 		train.set_route(0);