Diverge from a route early only if it's a loop

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

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 93dbedf544c27b029a56dc352f1f9e6e502be4ad..a6a47c0b5b13a291e30096795c87d2f8c1908628 100644 (file)
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -80,6 +80,17 @@ bool TrainRouter::set_route(const Route *r)
        return true;
 }
 
+bool TrainRouter::add_route(const Route &r)
+{
+       if(routes.empty())
+               return set_route(&r);
+
+       // TODO Check that it can be reached from previous routes
+       routes.push_back(&r);
+
+       return true;
+}
+
 void TrainRouter::add_wait(Block &block, Train *tr)
 {
        Wait wait;
@@ -255,14 +266,21 @@ void TrainRouter::train_advanced(Block &block)
        // Check if we've reached the next route
        if(routes.size()>1)
        {
-               const Route &route = **++routes.begin();
-               if(route.has_track(*b_iter.endpoint().track))
+               Track &track = *b_iter.endpoint().track;
+               const Route *route = get_route();
+               bool change_route = false;
+               if(route->is_loop())
+                       change_route = (*++routes.begin())->has_track(track);
+               else
+                       change_route = !route->has_track(track);
+
+               if(change_route)
                {
                        routes.pop_front();
-                       const Route *r = get_route();
+                       route = get_route();
                        // XXX Exceptions?
-                       signal_route_changed.emit(r);
-                       signal_event.emit(Message("route-changed", r));
+                       signal_route_changed.emit(route);
+                       signal_event.emit(Message("route-changed", route));
                }
        }
 
@@ -332,17 +350,21 @@ Route *TrainRouter::create_lead_route(Route *lead, const Route *target)
                lead->set_temporary(true);
        }
 
-       set<Track *> tracks;
-       for(BlockIter i=train.get_block_allocator().first(); (i && i->get_train()==&train); i=i.next())
+       bool target_reached = false;
+       for(TrackIter i=train.get_block_allocator().first().track_iter(); i; i=i.next())
        {
-               const set<Track *> &btracks = i->get_tracks();
-               for(set<Track *>::const_iterator j=btracks.begin(); j!=btracks.end(); ++j)
-                       if(!target || !target->has_track(**j))
-                               tracks.insert(*j);
+               if(i->get_block().get_train()!=&train)
+                       break;
+               if(target)
+               {
+                       if(target->has_track(*i))
+                               target_reached = true;
+                       else if(target_reached)
+                               break;
+               }
+               lead->add_track(*i);
        }
 
-       lead->add_tracks(tracks);
-
        return lead;
 }