X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fextendtool.cpp;h=2a66181f32772c44557aef23fc64cd3479a65c27;hb=7c98e23312cf01ce1fa6c1ffd8e36c22d2fa6110;hp=3af4cf6cd0b1398f719e79346e3151794ff52939;hpb=05b95b6b6b095821f1e79dabed802b853c296c9d;p=r2c2.git

diff --git a/source/designer/extendtool.cpp b/source/designer/extendtool.cpp
index 3af4cf6..2a66181 100644
--- a/source/designer/extendtool.cpp
+++ b/source/designer/extendtool.cpp
@@ -154,20 +154,21 @@ void ExtendTool::finish()
 
 vector<Track *> ExtendTool::create_straight(const Vector &start, const Angle &dir, float length, float limit)
 {
-	const Catalogue::TrackMap &track_types = designer.get_catalogue().get_tracks();
+	const Catalogue::ObjectMap &object_types = designer.get_catalogue().get_all();
 	map<float, const TrackType *> types_by_length;
 	unsigned preference = 0;
-	for(Catalogue::TrackMap::const_iterator i=track_types.begin(); i!=track_types.end(); ++i)
-	{
-		const vector<TrackPart> &parts = i->second->get_parts();
-		if(parts.size()!=1)
-			continue;
-		if(parts.front().is_curved() || parts.front().is_dead_end())
-			continue;
+	for(Catalogue::ObjectMap::const_iterator i=object_types.begin(); i!=object_types.end(); ++i)
+		if(const TrackType *tt = dynamic_cast<const TrackType *>(i->second))
+		{
+			const vector<TrackPart> &parts = tt->get_parts();
+			if(parts.size()!=1)
+				continue;
+			if(parts.front().is_curved() || parts.front().is_dead_end())
+				continue;
 
-		types_by_length[parts.front().get_length()] = i->second;
-		preference = max(preference, i->second->get_autofit_preference());
-	}
+			types_by_length[parts.front().get_length()] = tt;
+			preference = max(preference, tt->get_autofit_preference());
+		}
 
 	vector<float> lengths;
 	float removed = 0;