X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Froute.cpp;h=795ae3215bbcbff77fa7eadc9b0baded96f70dd7;hb=581267f875f4ad32abd44dab6cd813bc871f55c5;hp=820ce1e32dad1536cce73ec313edfe70de9780f2;hpb=621c5c938d70ba0d155e0eda91a708db0a52c0dc;p=r2c2.git diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp index 820ce1e..795ae32 100644 --- a/source/libr2c2/route.cpp +++ b/source/libr2c2/route.cpp @@ -198,7 +198,7 @@ void Route::update_turnouts() { const TrackType::Endpoint &ep = links[j]->get_type().get_endpoint(links[j]->get_endpoint_by_link(**i)); int p = get_turnout(tid2); - if(p>=0 && !(ep.paths&(1<
=0 && !ep.has_path(p))
{
// The linked track is a turnout and has a path which is incompatible with this endpoint
mask &= ~endpoints[j].paths;
@@ -350,7 +350,7 @@ RouteValidityMask Route::check_validity(Track &trk) const
if(path>=0)
{
// Linking to a turnout with path set is only good if we're continuing that path
- if(ep.paths&(1<