Use path coercion in track iterators

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

diff --git a/source/libr2c2/trackiter.cpp b/source/libr2c2/trackiter.cpp
index 31ebf08e1f1c59711208c0f51722480cbc529c46..330e2f66c810bd9ee2c38cd0c6f2f1ebd14ae6d7 100644 (file)
--- a/source/libr2c2/trackiter.cpp
+++ b/source/libr2c2/trackiter.cpp
@@ -37,18 +37,20 @@ BlockIter TrackIter::block_iter() const
 
        if(!_track->get_type().is_turnout())
        {
-               TrackIter rev = reverse();
+               /* Since there was no endpoint match, the preceding track can't be in a
+               different block. */
+               TrackIter rev = flip();
                TrackIter last;
                while(rev && &rev.track()->get_block()==&block)
                {
                        last = rev;
                        rev = rev.next();
-
-                       // If we ran out of tracks, return an empty iterator
-                       if(!rev)
-                               return BlockIter();
                }
 
+               // If we ran out of tracks, return an empty iterator
+               if(!rev)
+                       return BlockIter();
+
                TrackIter fwd = last.reverse();
                for(unsigned i=0; i<beps.size(); ++i)
                        if(beps[i].track==fwd.track() && beps[i].track_ep==fwd.entry())
@@ -68,6 +70,7 @@ const TrackType::Endpoint &TrackIter::endpoint() const
 
 int TrackIter::get_exit(unsigned path) const
 {
+       path = _track->get_type().coerce_path(_entry, path);
        const vector<TrackType::Endpoint> &eps = _track->get_type().get_endpoints();
        
        // Find an endpoint that's connected to the entry and has the requested path