Factor out torpedo hit chance into shp_torp_hitchance()

This commit is contained in:
Markus Armbruster 2008-03-03 20:59:39 +01:00
parent 4849600cd5
commit 504f035450
5 changed files with 24 additions and 17 deletions

View file

@ -235,16 +235,6 @@ effrange(int rng, double tlev)
return techfact((int)tlev, rng / 2.0);
}
/*
* Return torpedo range for ship SP.
*/
double
torprange(struct shpstr *sp)
{
return effrange(sp->shp_frnge * 2, sp->shp_tech)
* sp->shp_effic / 100.0;
}
/*
* Return firing range for sector SP.
*/
@ -272,6 +262,25 @@ shp_fire_range(struct shpstr *sp)
return effrange(sp->shp_frnge, sp->shp_tech);
}
/*
* Return torpedo range for ship SP.
*/
double
torprange(struct shpstr *sp)
{
return effrange(sp->shp_frnge * 2, sp->shp_tech)
* sp->shp_effic / 100.0;
}
/*
* Return hit chance for torpedo from ship SP at range RANGE.
*/
double
shp_torp_hitchance(struct shpstr *sp, int range)
{
return DTORP_HITCHANCE(range, sp->shp_visib);
}
/*
* Return firing range for land unit SP.
*/