delete trains.begin()->second;
while(!routes.empty())
delete *routes.begin();
+ while(!zones.empty())
+ delete *zones.begin();
while(!tracks.empty())
delete *tracks.begin();
while(!blocks.empty())
}
}
-unsigned Layout::allocate_turnout_id(bool dbl)
+unsigned Layout::allocate_turnout_id()
{
set<unsigned> used_ids;
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
used_ids.insert((*i)->get_turnout_id());
unsigned result = next_turnout_id;
- while(used_ids.count(result) || (dbl && used_ids.count(result+1)))
+ while(used_ids.count(result))
++result;
- next_turnout_id = result+1+dbl;
+ next_turnout_id = result+1;
return result;
}