X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Froute.cpp;h=ad6f81169e5a36221e05934ba5f4cb0e7d6439e3;hb=b14059de03324aecde3efc649293d98ce5b7aaf2;hp=4f7e778441bdf2e03aa9b12cfeb9b96e677cdaf5;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp
index 4f7e778..ad6f811 100644
--- a/source/libr2c2/route.cpp
+++ b/source/libr2c2/route.cpp
@@ -12,6 +12,7 @@ Distributed under the GPL
 #include "track.h"
 #include "trackiter.h"
 #include "tracktype.h"
+#include "zone.h"
 
 using namespace std;
 using namespace Msp;
@@ -364,7 +365,7 @@ unsigned Route::check_validity(Track &trk) const
 							const TrackType::Endpoint &ep2 = tlinks[j]->get_type().get_endpoint(tlinks[j]->get_endpoint_by_link(**i));
 							path = get_turnout(tid2);
 							// Ignore a linked turnout with some other path set
-							if(path>0 && !(ep2.paths&(1<<path)))
+							if(path>=0 && !(ep2.paths&(1<<path)))
 								continue;
 						}
 
@@ -404,6 +405,11 @@ Route *Route::find(const TrackIter &from, const Route &to)
 	return create_route(from, TrackInSet(to.get_tracks()));
 }
 
+Route *Route::find(const TrackIter &from, const Zone &to)
+{
+	return create_route(from, TrackInSet(to.get_tracks()));
+}
+
 Route *Route::find(const TrackIter &from, const set<Track *> &to)
 {
 	return create_route(from, TrackInSet(to));