X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=9a86263b9bec5922fa58d8201529731e79c01944;hb=c435f10d8de8a4058c43bcfc6c7073c8a8798463;hp=5691ac9a30ccdbdcc15e506d3581f2be26cddc31;hpb=fb5bd959109927ea02ead1483a4bb0c5a66784a4;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 5691ac9..9a86263 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -266,14 +266,21 @@ void TrainRouter::train_advanced(Block &block)
 	// Check if we've reached the next route
 	if(routes.size()>1)
 	{
-		const Route &route = **++routes.begin();
-		if(route.has_track(*b_iter.endpoint().track))
+		Track &track = *b_iter.endpoint().track;
+		const Route *route = get_route();
+		bool change_route = false;
+		if(route->is_loop())
+			change_route = (*++routes.begin())->has_track(track);
+		else
+			change_route = !route->has_track(track);
+
+		if(change_route)
 		{
 			routes.pop_front();
-			const Route *r = get_route();
+			route = get_route();
 			// XXX Exceptions?
-			signal_route_changed.emit(r);
-			signal_event.emit(Message("route-changed", r));
+			signal_route_changed.emit(route);
+			signal_event.emit(Message("route-changed", route));
 		}
 	}
 
@@ -364,10 +371,15 @@ Route *TrainRouter::create_lead_route(Route *lead, const Route *target)
 bool TrainRouter::advance_route(RouteList::iterator &iter, const Block &block)
 {
 	const set<Track *> &tracks = block.get_tracks();
+	unsigned turnout_addr = block.get_turnout_address();
 	for(; iter!=routes.end(); ++iter)
+	{
+		if(turnout_addr && (*iter)->get_turnout(turnout_addr)<0)
+			continue;
 		for(set<Track *>::const_iterator j=tracks.begin(); j!=tracks.end(); ++j)
 			if((*iter)->has_track(**j))
 				return true;
+	}
 
 	return false;
 }