Immediately process sequence points that are already covered

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

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index a1582fd65c64920346c1566f3a161d46b4df6dc8..38027dbe896942f6b232b1abcd565393a99d9ca5 100644 (file)
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -77,6 +77,7 @@ void TrainRouter::route_changed()
                can't rely on the resync code in block_reserved since we may need to
                clear the stop marker to continue allocation. */
                TrackIter track = train.get_block_allocator().first().track_iter();
+               list<SequencePoint>::iterator seq_begin = sequence_points.begin();
                for(; track; track=track.next())
                {
                        if(!advance_to_track(reserving_route, track))
@@ -86,7 +87,15 @@ void TrainRouter::route_changed()
                        }
                        if(&track->get_block()==fncb.block())
                                break;
+
+                       if(seq_begin!=sequence_points.end() && seq_begin->block==&track->get_block())
+                       {
+                               current_sequence = seq_begin->sequence_out;
+                               ++seq_begin;
+                       }
                }
+
+               sequence_points.erase(sequence_points.begin(), seq_begin);
        }
 
        if(!already_at_end)
@@ -354,6 +363,7 @@ void TrainRouter::train_advanced(Block &block)
                                if(!wp.has_track(*t_iter))
                                {
                                        waypoints.erase(waypoints.begin());
+                                       metrics_stale = true;
                                        signal_waypoint_reached.emit(&wp);
                                        signal_event.emit(Message("waypoint-reached", &wp));
                                        break;
@@ -390,6 +400,8 @@ void TrainRouter::create_metrics()
                delete *i;
        metrics.clear();
 
+       metrics_stale = false;
+
        if(!destination)
                return;
 
@@ -399,8 +411,6 @@ void TrainRouter::create_metrics()
 
        for(unsigned i=metrics.size(); --i>0; )
                metrics[i]->chain_to(*metrics[(i+1)%metrics.size()]);
-
-       metrics_stale = false;
 }
 
 bool TrainRouter::create_lead_route()