X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Frouteselect.cpp;h=cd1e7042e846b730ca180b71a96efe4ff21e5f29;hb=e13742268b7030f8d6152858d39f1c6b43f94c88;hp=3413220a46aea4c8cac349230c29cdc486cd7850;hpb=025c23f199c411cc2ec1a6d2e85bf24460150ceb;p=r2c2.git

diff --git a/source/engineer/routeselect.cpp b/source/engineer/routeselect.cpp
index 3413220..cd1e704 100644
--- a/source/engineer/routeselect.cpp
+++ b/source/engineer/routeselect.cpp
@@ -30,25 +30,38 @@ 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 map<string, Route *> &routes = engineer.get_layout().get_routes();
+	const set<Route *> &routes = engineer.get_layout().get_routes();
 	unsigned n = 1;
-	for(map<string, Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i, ++n)
-	{
-		drp_route->append(i->second->get_name());
-		if(i->second==train.get_route())
-			drp_route->set_selected_index(n);
-	}
+	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
+		if(!(*i)->is_temporary())
+		{
+			drp_route->append((*i)->get_name());
+			if(*i==train.get_route())
+				drp_route->set_selected_index(n);
+			++n;
+		}
 }
 
 void RouteSelect::on_ok_clicked()
 {
 	if(drp_route->get_selected_index()>0)
 	{
-		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);
+		const set<Route *> &routes = engineer.get_layout().get_routes();
+		set<Route *>::const_iterator i = routes.begin();
+		unsigned n = drp_route->get_selected_index()-1;
+		while(i!=routes.end())
+		{
+			if(!(*i)->is_temporary())
+			{
+				if(!n)
+					break;
+				--n;
+			}
+			++i;
+		}
 		
-		train.set_route(i->second);
+		if(!train.set_route(*i))
+			engineer.set_status("Could not set route");
 	}
 	else
 		train.set_route(0);