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

Move printing from ac_planedamage() into callers

Browse source 
It prints only if show is non-zero, so only ac_fireflak() is affected.
This commit is contained in:
Markus Armbruster 2010-06-16 21:20:27 +02:00
parent 4007fc0f99
commit 16b16e34b3
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/lib/subs/aircombat.c
View file

@ -552,13 +552,6 @@ ac_planedamage(struct plist *plp, natid from, int dam,
} else if (show == 0) } else if (show == 0)
snprintf(mesg, 14, " cleared"); snprintf(mesg, 14, " cleared");
if ((plp->pcp->pl_flags & P_M) == 0) {
if (show) {
PR(pp->pln_own, " %s %s takes %d%s.\n",
cname(pp->pln_own), prplane(pp), dam, mesg);
}
}
pp->pln_effic = eff; pp->pln_effic = eff;
pp->pln_mobil -= MIN(32 + pp->pln_mobil, dam / 2); pp->pln_mobil -= MIN(32 + pp->pln_mobil, dam / 2);
if (disp) { if (disp) {
@ -708,6 +701,8 @@ ac_fireflak(struct emp_qelem *list, natid from, int guns)
plp = (struct plist *)qp; plp = (struct plist *)qp;
n = ac_flak_dam(guns, pln_def(&plp->plane), plp->pcp->pl_flags); n = ac_flak_dam(guns, pln_def(&plp->plane), plp->pcp->pl_flags);
ac_planedamage(plp, from, n, 1, msg); ac_planedamage(plp, from, n, 1, msg);
PR(plp->plane.pln_own, " %s %s takes %d%s.\n",
cname(plp->plane.pln_own), prplane(&plp->plane), n, msg);
} }
} }