Drop waypoints once the train has fully covered them

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index da3b7d515fe253b79db3412ea0e98d2bd062d6ea..7ed90992457a1a329fe12b815fa859ee2997eec5 100644 (file)
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -242,6 +242,25 @@ void TrainRouter::train_advanced(Block &block)
                }
        }
 
+       if(!waypoints.empty())
+       {
+               const TrackChain &wp = *waypoints.front();
+               TrackIter t_iter = b_iter.track_iter();
+               if(wp.has_track(*t_iter))
+               {
+                       for(; t_iter; t_iter=t_iter.next())
+                       {
+                               if(!wp.has_track(*t_iter))
+                               {
+                                       waypoints.erase(waypoints.begin());
+                                       break;
+                               }
+                               else if(!block.has_track(*t_iter))
+                                       break;
+                       }
+               }
+       }
+
        if(!routes.empty())
        {
                b_iter = b_iter.next();