X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=0594b7ac635a81bb3a5691bbd77c58d53399c491;hb=HEAD;hp=476d102617ff1045658d80391f73cf1f4ccedfee;hpb=61dbeed5017acf9d8e7eeb5ecf1df23d6e546afd;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index 476d102..0594b7a 100644
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -249,6 +249,9 @@ TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t):
 	router(train->get_ai_of_type<TrainRouter>()),
 	has_duration(false)
 {
+	if(!router)
+		return;
+
 	if(unsigned n_wps = router->get_n_waypoints())
 	{
 		waypoints.reserve(n_wps),
@@ -367,13 +370,16 @@ TrainRoutePlanner::TrainRoutingState::~TrainRoutingState()
 
 Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() const
 {
-	return ((occupied_tracks->path_length-offset)/info->speed)*Time::sec+delay;
+	return ((occupied_tracks->path_length-offset)/info->speed)*Time::sec+delay+estimated_wait;
 }
 
 Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_pass(Track &trk) const
 {
 	if(is_occupying(trk))
 	{
+		if(state==ARRIVED && info->has_duration)
+			return duration;
+
 		float passed_length = 0;
 		for(const OccupiedTrack *occ=occupied_tracks; (occ && occ->track!=&trk); occ=occ->next)
 			passed_length += occ->path_length;
@@ -734,15 +740,21 @@ int TrainRoutePlanner::RoutingStep::find_next_train() const
 	Time::TimeDelta min_dt;
 	int next_train = -1;
 	for(unsigned i=0; i<trains.size(); ++i)
+	{
+		Time::TimeDelta dt;
 		if(trains[i].state==MOVING || (trains[i].state==BLOCKED && prev && prev->trains[i].state==MOVING))
+			dt = trains[i].get_time_to_next_track();
+		else if(trains[i].state==BLOCKED && trains[trains[i].blocked_by].state==ARRIVED)
+			dt = trains[i].estimated_wait;
+		else
+			continue;
+
+		if(dt<min_dt || next_train<0)
 		{
-			Time::TimeDelta dt = trains[i].get_time_to_next_track();
-			if(dt<min_dt || next_train<0)
-			{
-				min_dt = dt;
-				next_train = i;
-			}
+			min_dt = dt;
+			next_train = i;
 		}
+	}
 
 	return next_train;
 }