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

Simplify calls to mpr()

Browse source 
mpr() does nothing when its first argument is zero.  No need to avoid
calling it in that case; remove the conditionals.
This commit is contained in:
Markus Armbruster 2008-03-22 11:04:53 +01:00
parent 4c0d843c01
commit 0a962c0380
3 changed files with 25 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/lib/subs/detonate.c
View file

@ -98,9 +98,8 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
continue;
if (type == SCT_SANCT) {
mpr(bombown, "bounced off %s\n", xyas(ns.x, ns.y, bombown));
if (own != 0)
mpr(own, "%s nuclear device bounced off %s\n",
cname(bombown), xyas(ns.x, ns.y, bombown));
mpr(own, "%s nuclear device bounced off %s\n",
cname(bombown), xyas(ns.x, ns.y, bombown));
nreport(bombown, N_NUKE, own, 1);
continue;
}
@ -191,10 +190,9 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
prplane(&plane),
xyas(plane.pln_x, plane.pln_y, own), damage);
} else {
if (own != 0)
mpr(own, "%s nuclear device did %d%% damage to %s at %s\n",
cname(bombown), damage,
prplane(&plane), xyas(plane.pln_x, plane.pln_y, own));
mpr(own, "%s nuclear device did %d%% damage to %s at %s\n",
cname(bombown), damage,
prplane(&plane), xyas(plane.pln_x, plane.pln_y, own));
}
putplane(ni.cur, &plane);
}
@ -239,10 +237,9 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
mpr(bombown, "%s at %s reports %d%% damage\n",
prland(&land), xyas(land.lnd_x, land.lnd_y, own), damage);
} else {
if (own != 0)
mpr(own, "%s nuclear device did %d%% damage to %s at %s\n",
cname(bombown), damage,
prland(&land), xyas(land.lnd_x, land.lnd_y, own));
mpr(own, "%s nuclear device did %d%% damage to %s at %s\n",
cname(bombown), damage,
prland(&land), xyas(land.lnd_x, land.lnd_y, own));
}
putland(land.lnd_uid, &land);
}
@ -281,10 +278,9 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
mpr(bombown, "%s at %s reports %d%% damage\n",
prship(&ship), xyas(ship.shp_x, ship.shp_y, own), damage);
} else {
if (own != 0)
mpr(own, "%s nuclear device did %d%% damage to %s at %s\n",
cname(bombown), damage, prship(&ship),
xyas(ship.shp_x, ship.shp_y, own));
mpr(own, "%s nuclear device did %d%% damage to %s at %s\n",
cname(bombown), damage, prship(&ship),
xyas(ship.shp_x, ship.shp_y, own));
}
putship(ship.shp_uid, &ship);
}
@ -307,9 +303,8 @@ detonate(struct nukstr *np, coord x, coord y, int airburst)
mpr(bombown, "%s at %s destroyed\n",
prnuke(&nuke), xyas(nuke.nuk_x, nuke.nuk_y, own));
} else {
if (own != 0)
mpr(own, "%s at %s destroyed\n",
prnuke(&nuke), xyas(nuke.nuk_x, nuke.nuk_y, own));
mpr(own, "%s at %s destroyed\n",
prnuke(&nuke), xyas(nuke.nuk_x, nuke.nuk_y, own));
}
putnuke(ni.cur, &nuke);
}