unsigned Route::get_path(Track &trk) const
{
- if(unsigned taddr = trk.get_turnout_address())
+ if(trk.get_type().is_turnout())
{
- map<unsigned, int>::const_iterator i = turnouts.find(taddr);
- if(i!=turnouts.end())
+ map<unsigned, int>::const_iterator i = turnouts.find(trk.get_turnout_address());
+ if(i!=turnouts.end() && i->second>=0)
return i->second;
}
return trk.get_active_path();