X-Git-Url: http://git.tdb.fi/?p=r2c2.git;a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=ad97cf79f77c0255f23b9c1be7ed5cf0cfe58e69;hp=97f1cf6c8501af801a42b2123768503c929e7b14;hb=5b71cb905051d654c150cb0e098cade0cb502105;hpb=44e13f6732f206aa72ff7b001d77fe59bf2830ee

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index 97f1cf6..ad97cf7 100644
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -363,7 +363,7 @@ TrainRoutePlanner::TrainRoutingState::~TrainRoutingState()
 
 Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() const
 {
-	return ((track->get_type().get_path_length(path)-offset)/info->speed)*Time::sec+delay;
+	return ((occupied_tracks->path_length-offset)/info->speed)*Time::sec+delay;
 }
 
 Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_pass(Track &trk) const
@@ -520,7 +520,7 @@ void TrainRoutePlanner::TrainRoutingState::update_estimate()
 	TrackIter iter = track.reverse(path);
 	remaining_estimate = info->metrics[waypoint]->get_distance_from(*iter.track(), iter.entry());
 	if(remaining_estimate>=0)
-		remaining_estimate += track->get_type().get_path_length(path)-offset;
+		remaining_estimate += occupied_tracks->path_length-offset;
 }
 
 bool TrainRoutePlanner::TrainRoutingState::is_viable() const