const Vehicle::Axle &Vehicle::get_fixed_axle(unsigned i) const
{
if(i>=axles.size())
- throw InvalidParameterValue("Axle index out of range");
+ throw out_of_range("Vehicle::get_fixed_axle");
return axles[i];
}
const Vehicle::Bogie &Vehicle::get_bogie(unsigned i) const
{
if(i>=bogies.size())
- throw InvalidParameterValue("Bogie index out of range");
+ throw out_of_range("Vehicle::get_bogie");
return bogies[i];
}
const Vehicle::Axle &Vehicle::get_bogie_axle(unsigned i, unsigned j) const
{
if(i>=bogies.size())
- throw InvalidParameterValue("Bogie index out of range");
+ throw out_of_range("Vehicle::get_bogie_axle");
if(j>=bogies[i].axles.size())
- throw InvalidParameterValue("Axle index out of range");
+ throw out_of_range("Vehicle::get_bogie_axle");
return bogies[i].axles[j];
}
const Vehicle::Rod &Vehicle::get_rod(unsigned i) const
{
if(i>=rods.size())
- throw InvalidParameterValue("Rod index out of range");
+ throw out_of_range("Vehicle::get_rod");
return rods[i];
}
float margin = layout.get_catalogue().get_scale();
float dist = distance(veh.position, position);
- if(dist<tdist-margin || dist>tdist+margin)
+ if(!track_pos.track || dist<tdist-margin || dist>tdist+margin)
{
track_pos = veh.track_pos;
track_pos.advance(sign*tdist);