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

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index c07f9e8..476d102 100644
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -308,6 +308,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf):
 	delay(info->router->get_departure_delay()),
 	duration(info->router->get_trip_duration()),
 	waypoint(0),
+	distance_traveled(0),
 	blocked_by(-1)
 {
 	const Vehicle *veh = &info->train->get_vehicle(0);
@@ -492,15 +493,16 @@ void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt)
 	if(estimated_wait)
 		estimated_wait = max(estimated_wait-secs*Time::sec, Time::zero);
 
-	if(state==MOVING)
+	float distance = info->speed*secs;
+	float remaining_on_track = occupied_tracks->path_length-offset;
+	if(state==MOVING || distance<remaining_on_track)
 		advance(info->speed*secs);
 	else if(state!=ARRIVED)
 	{
-		float remaining_distance = occupied_tracks->path_length-offset;
-		if(remaining_distance>0)
+		if(remaining_on_track>0)
 		{
-			advance(remaining_distance);
-			wait_time += (secs-remaining_distance/info->speed)*Time::sec;
+			advance(remaining_on_track);
+			wait_time += (secs-remaining_on_track/info->speed)*Time::sec;
 		}
 		else
 			wait_time += secs*Time::sec;