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

(ac_calc_flak,ac_fireflak,pinflak_planedamage): New ac_calc_flak().

Browse source 
Move common flak damage code from ac_fireflak() and
pinflak_planedamage() to ac_calc_flak().
This commit is contained in:
Ron Koenderink 2004-12-16 19:40:06 +00:00
parent 3645ee77c8
commit 2c4b89e2d1
4 changed files with 35 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/lib/commands/bomb.c
View file

@ -885,11 +885,6 @@ strat_bomb(struct emp_qelem *list, struct sctstr *target)
putsect(&sect);
}
#define FLAK_MAX 15
float lflaktable[16] = { 0.20, 0.20, 0.25, 0.30, 0.35, 0.40, 0.45, 0.50,
0.50, 0.55, 0.60, 0.65, 0.70, 0.75, 0.80, 0.85,
};
static int
pinflak_planedamage(struct plnstr *pp, struct plchrstr *pcp, natid from,
int flak)
@ -902,26 +897,13 @@ pinflak_planedamage(struct plnstr *pp, struct plchrstr *pcp, natid from,
struct lndstr land;
natid plane_owner;
int dam;
float mult;
flak -= (pp->pln_def + 1);
if (pcp->pl_flags & P_X)
flak -= 2;
if (pcp->pl_flags & P_H)
flak -= 1;
if (flak > 8)
mult = lflaktable[FLAK_MAX] * 1.33;
else if (flak < -7)
mult = lflaktable[0] * 0.66;
else {
flak += 7;
mult = lflaktable[flak];
}
mult *= flakscale;
dam = (int)((roll(8) + 2) * mult);
if (dam > 100)
dam = 100;
dam = ac_flak_dam(flak);
disp = 0;
plane_owner = pp->pln_own;
eff = pp->pln_effic;