Change terminology to better distinguish routes on the layout from paths across track...

[r2c2.git] / source / libmarklin / track.cpp

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index 617328a64b7d24e474b39a50deae8e2f12dbda1b..d2822f61efacbf92d1af2bccb9a531b533dadc37 100644 (file)
--- a/source/libmarklin/track.cpp
+++ b/source/libmarklin/track.cpp
@@ -223,7 +223,7 @@ Track *Track::get_link(unsigned i) const
        return links[i];
 }
 
-int Track::traverse(unsigned i, unsigned route) const
+int Track::traverse(unsigned i, unsigned path) const
 {
        const vector<Endpoint> &eps = type.get_endpoints();
        if(i>=eps.size())
@@ -231,25 +231,25 @@ int Track::traverse(unsigned i, unsigned route) const
 
        const Endpoint &ep = eps[i];
        
-       if(ep.routes&(1<<route))
+       if(ep.paths&(1<<path))
        {
-               // Find the other endpoint for this route
+               // Find the other endpoint for this path
                for(unsigned j=0; j<eps.size(); ++j)
-                       if((eps[j].routes&(1<<route)) && j!=i)
+                       if((eps[j].paths&(1<<path)) && j!=i)
                                return j;
        }
        else
        {
-               // Find an endpoint that's connected to this one and has the requested route
+               // Find an endpoint that's connected to this one and has the requested path
                for(unsigned j=0; j<eps.size(); ++j)
-                       if((eps[j].routes&(1<<route)) && (eps[j].routes&ep.routes))
+                       if((eps[j].paths&(1<<path)) && (eps[j].paths&ep.paths))
                                return j;
        }
 
        return -1;
 }
 
-Point Track::get_point(unsigned epi, unsigned route, float d) const
+Point Track::get_point(unsigned epi, unsigned path, float d) const
 {
        const vector<Endpoint> &eps = type.get_endpoints();
        if(epi>=eps.size())
@@ -264,7 +264,7 @@ Point Track::get_point(unsigned epi, unsigned route, float d) const
        {
                for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
                {
-                       if((eps[epi].routes&(1<<route)) && i->route!=route)
+                       if((eps[epi].paths&(1<<path)) && i->path!=path)
                                continue;
                        if(&*i==last_part)
                                continue;