X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftracktype.cpp;h=c6757cb221b12b9a206bdf6b0295f13fb835c789;hb=e1e5bf92fc73bd117c509ceea1c7de7d95288a7d;hp=692b5625f1335c59fbc594ae11b1816520916b0d;hpb=38fb8d56efde037a71c46a58bda314655e68ab6c;p=r2c2.git

diff --git a/source/libmarklin/tracktype.cpp b/source/libmarklin/tracktype.cpp
index 692b562..c6757cb 100644
--- a/source/libmarklin/tracktype.cpp
+++ b/source/libmarklin/tracktype.cpp
@@ -18,14 +18,14 @@ TrackType::TrackType(unsigned a):
 
 float TrackType::get_total_length() const
 {
-	return get_route_length(-1);
+	return get_path_length(-1);
 }
 
-float TrackType::get_route_length(int r) const
+float TrackType::get_path_length(int p) const
 {
 	float len = 0;
 	for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-		if(r<0 || i->route==static_cast<unsigned>(r))
+		if(p<0 || i->path==static_cast<unsigned>(p))
 		{
 			float l = i->length;
 			if(i->radius)
@@ -35,12 +35,12 @@ float TrackType::get_route_length(int r) const
 	return len;
 }
 
-unsigned TrackType::get_n_routes() const
+unsigned TrackType::get_n_paths() const
 {
 	unsigned n = 1;
 	for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-		if(i->route>=n)
-			n = i->route+1;
+		if(i->path>=n)
+			n = i->path+1;
 	return n;
 }
 
@@ -67,7 +67,7 @@ void TrackType::collect_endpoints()
 					da -= M_PI*2;
 				if(da<-3.1 || da>3.1)
 					rm = true;
-				i->routes |= j->routes;
+				i->paths |= j->paths;
 				j = endpoints.erase(j);
 			}
 			else