X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Froute.cpp;h=80c61088eda68223be46299bac6621b289291d35;hb=5c1ddd2f213af3fea15237e02f7da112c0abba36;hp=788b235658ff53b148ee36c18b47ef65c268eeec;hpb=b447610feefb8b18be29d71d018829ac8e6d1a23;p=r2c2.git

diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp
index 788b235..80c6108 100644
--- a/source/libr2c2/route.cpp
+++ b/source/libr2c2/route.cpp
@@ -272,14 +272,21 @@ void Route::add_tracks(const set<Track *> &trks)
 		if(!tracks.count(*i))
 			pending.insert(*i);
 
+	if(tracks.empty())
+	{
+		set<Track *>::iterator i = pending.begin();
+		tracks.insert(*i);
+		pending.erase(i);
+	}
+
 	while(!pending.empty())
 	{
 		RouteValidityMask valid = ROUTE_INVALID;
-		for(set<Track *>::const_iterator i=pending.begin(); i!=pending.end(); ++i)
-			if(tracks.empty() || (valid=check_validity(**i))==ROUTE_VALID)
+		for(set<Track *>::iterator i=pending.begin(); i!=pending.end(); ++i)
+			if((valid=check_validity(**i))==ROUTE_VALID)
 			{
 				tracks.insert(*i);
-				pending.erase(*i);
+				pending.erase(i);
 				break;
 			}
 
@@ -290,9 +297,12 @@ void Route::add_tracks(const set<Track *> &trks)
 	update_turnouts();
 }
 
-void Route::add_track_chain(Track &start, unsigned ep, const TurnoutMap &trnts)
+void Route::add_track_chain(const TrackIter &start, const TurnoutMap &trnts)
 {
-	TrackIter iter(&start, ep);
+	if(!start)
+		throw invalid_argument("Route::add_track_chain");
+
+	TrackIter iter = start;
 	while(iter)
 	{
 		if(iter->get_type().is_dead_end())
@@ -444,9 +454,9 @@ void Route::Loader::finish()
 			{
 				Track *link = (*i)->get_link(k);
 				if(!obj.tracks.count(link))
-					obj.add_track_chain(*link, link->get_link_slot(**i), turnouts);
+					obj.add_track_chain(TrackIter(link, link->get_link_slot(**i)), turnouts);
 				if(!obj.tracks.count(*i))
-					obj.add_track_chain(**i, k, turnouts);
+					obj.add_track_chain(TrackIter(*i, k), turnouts);
 				break;
 			}