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

Simplify ac_planedamage() to write straight to mesg[]

Browse source
This commit is contained in:
Markus Armbruster 2010-06-16 20:41:53 +02:00
parent d96202fc90
commit 38ae0252b8
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -532,35 +532,32 @@ ac_planedamage(struct plist *plp, natid from, int dam,
{ {
struct plnstr *pp; struct plnstr *pp;
int disp; int disp;
char dmess[255];
int eff; int eff;
disp = 0; disp = 0;
pp = &plp->plane; pp = &plp->plane;
eff = pp->pln_effic; eff = pp->pln_effic;
sprintf(dmess, " no damage"); *mesg = 0;
if (dam <= 0) { if (dam <= 0) {
strcpy(mesg, dmess); sprintf(mesg, " no damage");
return; return;
} }
memset(dmess, 0, sizeof(dmess));
eff -= dam; eff -= dam;
if (eff < 0) if (eff < 0)
eff = 0; eff = 0;
if (eff < PLANE_MINEFF) { if (eff < PLANE_MINEFF) {
sprintf(dmess, " shot down"); sprintf(mesg, " shot down");
disp = 1; disp = 1;
} else if (eff < 80 && chance((80 - eff) / 100.0)) { } else if (eff < 80 && chance((80 - eff) / 100.0)) {
sprintf(dmess, " aborted @%2d%%", eff); sprintf(mesg, " aborted @%2d%%", eff);
disp = 2; disp = 2;
} else if (show == 0) { } else if (show == 0)
sprintf(dmess, " cleared"); sprintf(mesg, " cleared");
}
if ((plp->pcp->pl_flags & P_M) == 0) { if ((plp->pcp->pl_flags & P_M) == 0) {
if (show) { if (show) {
PR(pp->pln_own, " %s %s takes %d%s.\n", PR(pp->pln_own, " %s %s takes %d%s.\n",
cname(pp->pln_own), prplane(pp), dam, dmess); cname(pp->pln_own), prplane(pp), dam, mesg);
} }
} }
@ -572,7 +569,6 @@ ac_planedamage(struct plist *plp, natid from, int dam,
pln_put1(plp); pln_put1(plp);
} else } else
putplane(pp->pln_uid, pp); putplane(pp->pln_uid, pp);
strcpy(mesg, dmess);
} }
static void static void