X-Git-Url: http://git.tdb.fi/?p=r2c2.git;a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=75d746b3c6dd103cd148ae233f90361a189c2328;hp=90d769140725fdc00a708a8c55318f6fb2ea12b2;hb=3dd660ffad729fbd6e75e6401f5c7f27b9013faf;hpb=1c15570729bbce44f0518373ca5bf8bf41cfa3b3

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index 90d7691..75d746b 100644
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -232,16 +232,16 @@ TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t):
 	speed(train->get_maximum_speed()),
 	first_noncritical(train->get_last_critical_block().next().block()),
 	router(train->get_ai_of_type<TrainRouter>()),
-	waypoints(router ? router->get_n_waypoints() : 0),
 	has_duration(false)
 {
-	if(!waypoints.empty())
+	if(unsigned n_wps = router->get_n_waypoints())
 	{
-		metrics.resize(waypoints.size());
-		for(unsigned i=0; i<waypoints.size(); ++i)
+		waypoints.reserve(n_wps),
+		metrics.reserve(n_wps);
+		for(unsigned i=0; i<n_wps; ++i)
 		{
-			waypoints[i] = &router->get_waypoint(i);
-			metrics[i] = &router->get_metric(i);
+			waypoints.push_back(router->get_waypoint(i));
+			metrics.push_back(&router->get_metric(i));
 		}
 		has_duration = router->get_trip_duration();
 	}
@@ -362,17 +362,18 @@ bool TrainRoutePlanner::TrainRoutingState::check_arrival()
 {
 	TrackIter next_track = track.next(path);
 
-	const TrackChain *wp_chain = info->waypoints[waypoint];
-	if(wp_chain->has_track(*track) && !wp_chain->has_track(*next_track))
-	{
-		if(waypoint+1<info->waypoints.size())
-			++waypoint;
-		else
+	const TrainRouter::Waypoint &wp = info->waypoints[waypoint];
+	if(wp.chain->has_track(*track) && !wp.chain->has_track(*next_track))
+		if(wp.direction==TrackChain::UNSPECIFIED || track==wp.chain->iter_for(*track, wp.direction))
 		{
-			state = ARRIVED;
-			return true;
+			if(waypoint+1<info->waypoints.size())
+				++waypoint;
+			else
+			{
+				state = ARRIVED;
+				return true;
+			}
 		}
-	}
 
 	if(info->first_noncritical->has_track(*track))
 		critical = false;