empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(fire_dchrg, fire_torp): Simplify.

Browse source
This commit is contained in:
Markus Armbruster 2006-04-30 18:28:54 +00:00
parent e94c6e5a3e
commit e352801820
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/lib/commands/torp.c
View file

@ -367,6 +367,8 @@ fire_dchrg(struct shpstr *sp, struct shpstr *targ, int ntargets)
guneff = seagun(sp->shp_effic, gun); guneff = seagun(sp->shp_effic, gun);
dam = (int)guneff; dam = (int)guneff;
if (ntargets > 2)
dam /= ntargets / 2;
if ((mchr[(int)targ->shp_type].m_flags & M_SUB) == 0) { if ((mchr[(int)targ->shp_type].m_flags & M_SUB) == 0) {
pr_beep(); pr_beep();
@ -374,9 +376,6 @@ fire_dchrg(struct shpstr *sp, struct shpstr *targ, int ntargets)
if (sp->shp_own != 0) if (sp->shp_own != 0)
wu(0, sp->shp_own, wu(0, sp->shp_own,
"%s fired at %s\n", prship(sp), prship(targ)); "%s fired at %s\n", prship(sp), prship(targ));
if (ntargets > 2)
dam /= ((float)ntargets / 2.0);
pr_beep(); pr_beep();
pr("BLAM! %d damage!\n", dam); pr("BLAM! %d damage!\n", dam);
shipdamage(targ, dam); shipdamage(targ, dam);
@ -386,10 +385,6 @@ fire_dchrg(struct shpstr *sp, struct shpstr *targ, int ntargets)
if (sp->shp_own != 0) if (sp->shp_own != 0)
wu(0, sp->shp_own, wu(0, sp->shp_own,
"%s depth charged %s\n", prship(sp), prsub(targ)); "%s depth charged %s\n", prship(sp), prsub(targ));
if (ntargets > 2)
dam /= ((float)ntargets / 2.0);
pr("click...WHAM! %d damage!\n", dam); pr("click...WHAM! %d damage!\n", dam);
shipdamage(targ, dam); shipdamage(targ, dam);
putship(targ->shp_uid, targ); putship(targ->shp_uid, targ);
@ -447,9 +442,8 @@ fire_torp(struct shpstr *sp, struct shpstr *targ, int range, int ntargets)
prship(sp), prship(sp),
xyas(sp->shp_x, sp->shp_y, sp->shp_own), prsub(targ)); xyas(sp->shp_x, sp->shp_y, sp->shp_own), prsub(targ));
dam = TORP_DAMAGE(); dam = TORP_DAMAGE();
if (ntargets > 2) if (ntargets > 2)
dam /= ((float)ntargets / 2.0); dam /= ntargets / 2;
shipdamage(targ, dam); shipdamage(targ, dam);
putship(targ->shp_uid, targ); putship(targ->shp_uid, targ);