Further fix delay handling

[r2c2.git] / source / libr2c2 / trainrouteplanner.cpp

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index cd79a61c8f947ff64a4533396fc716ca6ff24387..b4d4afd64c23bd0b43ee0361d410d86ef9245f1f 100644 (file)
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -270,9 +270,26 @@ void TrainRoutePlanner::TrainRoutingState::advance(float distance)
                --occupied_tracks->n_tracks;
        }
 
-       remaining_estimate -= (distance/info->speed)*Time::sec;
-       if(remaining_estimate<Time::zero)
-               remaining_estimate = Time::zero;
+       remaining_estimate -= distance;
+}
+
+void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt)
+{
+       if(delay>=dt)
+       {
+               delay -= dt;
+               return;
+       }
+
+       float secs = dt/Time::sec;
+       if(delay)
+       {
+               secs -= delay/Time::sec;
+               delay = Time::zero;
+       }
+
+       if(state==MOVING)
+               advance(info->speed*secs);
 }
 
 void TrainRoutePlanner::TrainRoutingState::advance_track(unsigned next_path)
@@ -290,7 +307,7 @@ void TrainRoutePlanner::TrainRoutingState::update_estimate()
        TrackIter iter = track.reverse(path);
        float distance = info->router->get_metric(waypoint).get_distance_from(*iter.track(), iter.entry());
        distance += track->get_type().get_path_length(path)-offset;
-       remaining_estimate = (distance/info->speed)*Time::sec+delay;
+       remaining_estimate = distance;
 }
 
 
@@ -441,30 +458,14 @@ void TrainRoutePlanner::RoutingStep::advance(const Time::TimeDelta &dt)
 {
        time += dt;
        for(vector<TrainRoutingState>::iterator i=trains.begin(); i!=trains.end(); ++i)
-       {
-               if(i->delay)
-               {
-                       i->delay -= dt;
-                       if(i->delay>Time::zero)
-                               continue;
-                       i->delay = Time::zero;
-               }
-               else if(i->state==MOVING)
-                       i->advance(i->info->speed*(dt/Time::sec));
-       }
+               i->advance(dt);
 }
 
 void TrainRoutePlanner::RoutingStep::update_estimate()
 {
        for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
        {
-               if(i->remaining_estimate<Time::zero)
-               {
-                       total_estimate = i->remaining_estimate;
-                       return;
-               }
-
-               Time::TimeDelta t = time+i->remaining_estimate;
+               Time::TimeDelta t = time+(i->remaining_estimate/i->info->speed)*Time::sec+i->delay;
                if(i==trains.begin() || t>total_estimate)
                        total_estimate = t;
        }
@@ -475,6 +476,10 @@ bool TrainRoutePlanner::RoutingStep::is_viable() const
        if(total_estimate<Time::zero)
                return false;
 
+       for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+               if(i->remaining_estimate<0)
+                       return false;
+
        for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
                if(i->state==MOVING)
                        return true;