X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrack.cpp;h=d2822f61efacbf92d1af2bccb9a531b533dadc37;hb=a6a65f32fdf1b0eae00bfcafa70dbca5391cb09e;hp=01b789373c6fb655b712a6558533ec588adc08f9;hpb=38fb8d56efde037a71c46a58bda314655e68ab6c;p=r2c2.git

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index 01b7893..d2822f6 100644
--- a/source/libmarklin/track.cpp
+++ b/source/libmarklin/track.cpp
@@ -151,7 +151,12 @@ bool Track::snap_to(Track &other, bool link)
 			if(dx*dx+dy*dy<limit)
 			{
 				set_rotation(other.rot+other_eps[j].dir-eps[i].dir+M_PI);
-				set_position(Point(epp2.x-(eps[i].pos.x*cos(rot)-eps[i].pos.y*sin(rot)), epp2.y-(eps[i].pos.y*cos(rot)+eps[i].pos.x*sin(rot)), epp2.z));
+				Point p(epp2.x-(eps[i].pos.x*cos(rot)-eps[i].pos.y*sin(rot)),
+					epp2.y-(eps[i].pos.y*cos(rot)+eps[i].pos.x*sin(rot)),
+					epp2.z);
+				if(eps.size()==2 && i==1)
+					p.z -= slope;
+				set_position(p);
 
 				if(link)
 				{
@@ -218,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())
@@ -226,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())
@@ -259,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;