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

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

diff --git a/source/libmarklin/trackpart.cpp b/source/libmarklin/trackpart.cpp
index 943832fff413577dc77eabdef5d7d16840d61dbc..f2b61be1f37f2050105d94f020d4347aeb1dd2dc 100644 (file)
--- a/source/libmarklin/trackpart.cpp
+++ b/source/libmarklin/trackpart.cpp
@@ -16,13 +16,13 @@ TrackPart::TrackPart():
        dir(0),
        length(0),
        radius(0),
-       route(0),
+       path(0),
        dead_end(false)
 { }
 
 void TrackPart::collect_endpoints(vector<Endpoint> &eps) const
 {
-       eps.push_back(Endpoint(pos.x, pos.y, dir+M_PI, 1<<route));
+       eps.push_back(Endpoint(pos.x, pos.y, dir+M_PI, 1<<path));
 
        if(dead_end)
                ;
@@ -30,10 +30,10 @@ void TrackPart::collect_endpoints(vector<Endpoint> &eps) const
        {
                float a = ((radius<0) ? -length : length);
                Point p = get_point(length*abs(radius));
-               eps.push_back(Endpoint(p.x, p.y, dir+a, 1<<route));
+               eps.push_back(Endpoint(p.x, p.y, dir+a, 1<<path));
        }
        else
-               eps.push_back(Endpoint(pos.x+cos(dir)*length, pos.y+sin(dir)*length, dir, 1<<route));
+               eps.push_back(Endpoint(pos.x+cos(dir)*length, pos.y+sin(dir)*length, dir, 1<<path));
 }
 
 Point TrackPart::get_point(float d) const
@@ -58,7 +58,7 @@ TrackPart::Loader::Loader(TrackPart &p):
        add("start",    &Loader::start);
        add("length",   &TrackPart::length);
        add("radius",   &TrackPart::radius);
-       add("route",    &TrackPart::route);
+       add("path",     &TrackPart::path);
        add("dead_end", &TrackPart::dead_end);
 }