X-Git-Url: http://git.tdb.fi/?p=r2c2.git;a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=27fca7a56632c7bb1017844393f103192f1c634a;hp=2d6ab54550284f636a16d52870fee744f196b405;hb=91131237203bffe734219ab8b82b9d17f5d7a87d;hpb=b3cc0d29a0fda2d48443d66881214c81a04b1729

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 2d6ab54..27fca7a 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -63,6 +63,24 @@ const Route *TrainRouter::get_route() const
 	return routes.front();
 }
 
+void TrainRouter::use_planned_route()
+{
+	if(!planner || planner->get_result()!=TrainRoutePlanner::COMPLETE)
+		return;
+
+	const list<Route *> &planned_routes = planner->get_routes_for(train);
+
+	routes.clear();
+	routes.insert(routes.end(), planned_routes.begin(), planned_routes.end());
+	create_lead_route();
+
+	sequence_points = planner->get_sequence_for(train);
+	current_sequence = 0;
+	sequence_check_pending = false;
+
+	route_changed();
+}
+
 void TrainRouter::route_changed()
 {
 	BlockIter fncb = train.get_first_noncritical_block();
@@ -218,24 +236,7 @@ void TrainRouter::tick(const Time::TimeDelta &dt)
 		start_planning(train.get_layout());
 
 	if(planner && planner->check()!=TrainRoutePlanner::PENDING)
-	{
-		waypoints_changed = false;
-		if(planner->get_result()==TrainRoutePlanner::COMPLETE)
-		{
-			const list<Route *> &planned_routes = planner->get_routes_for(train);
-
-			routes.clear();
-			routes.insert(routes.end(), planned_routes.begin(), planned_routes.end());
-			create_lead_route();
-
-			sequence_points = planner->get_sequence_for(train);
-			current_sequence = 0;
-			sequence_check_pending = false;
-
-			route_changed();
-		}
-		planner = 0;
-	}
+		apply_plan(train.get_layout(), *planner);
 
 	if(sequence_check_pending)
 	{
@@ -488,14 +489,19 @@ bool TrainRouter::advance_to_track(RouteList::iterator &route, const TrackIter &
 	return true;
 }
 
-void TrainRouter::start_planning(Layout &layout)
+void TrainRouter::get_routers(Layout &layout, vector<TrainRouter *> &routers)
 {
-	vector<TrainRouter *> routers;
 	const map<unsigned, Train *> &trains = layout.get_trains();
 	routers.reserve(trains.size());
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 		if(TrainRouter *router = i->second->get_ai_of_type<TrainRouter>())
 			routers.push_back(router);
+}
+
+void TrainRouter::start_planning(Layout &layout)
+{
+	vector<TrainRouter *> routers;
+	get_routers(layout, routers);
 
 	for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
 		if((*i)->metrics_stale)
@@ -503,11 +509,27 @@ void TrainRouter::start_planning(Layout &layout)
 
 	RefPtr<TrainRoutePlanner> planner = new TrainRoutePlanner(layout);
 	for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
+	{
+		(*i)->waypoints_changed = false;
 		(*i)->planner = planner;
+	}
 
 	planner->plan_async();
 }
 
+void TrainRouter::apply_plan(Layout &layout, TrainRoutePlanner &planner)
+{
+	vector<TrainRouter *> routers;
+	get_routers(layout, routers);
+
+	for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
+		if((*i)->planner.get()==&planner)
+		{
+			(*i)->use_planned_route();
+			(*i)->planner = 0;
+		}
+}
+
 
 TrainRouter::SequencePoint::SequencePoint(Block &b, unsigned o):
 	block(&b),