From af50f0bdecaf4d08cf13227d092a788c65220845 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Thu, 7 Nov 2013 22:29:56 +0200 Subject: [PATCH] Use simpler logic when dealing with routes in TrackOffsetIter --- source/libr2c2/trackoffsetiter.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/source/libr2c2/trackoffsetiter.cpp b/source/libr2c2/trackoffsetiter.cpp index 01fd580..f8e8a2d 100644 --- a/source/libr2c2/trackoffsetiter.cpp +++ b/source/libr2c2/trackoffsetiter.cpp @@ -91,13 +91,7 @@ TrackOffsetIter TrackOffsetIter::advance(float d, const Route *r) const while(t) { if(p<0) - { - if(r) - if(unsigned tid = t->get_turnout_id()) - p = r->get_turnout(tid); - if(p<0) - p = t->get_active_path(); - } + p = (r ? r->get_path(*t) : t->get_active_path()); float length = t->get_type().get_path_length(p); if(o