X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrackpart.cpp;h=f2b61be1f37f2050105d94f020d4347aeb1dd2dc;hb=02c9a9779954d993cb73fe5f7a72b0847e87f633;hp=943832fff413577dc77eabdef5d7d16840d61dbc;hpb=38fb8d56efde037a71c46a58bda314655e68ab6c;p=r2c2.git

diff --git a/source/libmarklin/trackpart.cpp b/source/libmarklin/trackpart.cpp
index 943832f..f2b61be 100644
--- 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);
 }