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

Enable the new nuk_on_plane(), replacing the old one

Browse source 
Callers changed, as the new one isn't a drop-in replacements.
This commit is contained in:
Markus Armbruster 2008-09-06 19:22:56 -04:00
parent 64a53c90f0
commit 4086c25a15
6 changed files with 9 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/lib/subs/nuke.c
View file

@ -94,21 +94,6 @@ nuk_prewrite(int n, void *old, void *new)
np->nuk_own = own;
}
int
nuk_on_plane(struct nukstr *np, int pluid)
{
struct nstr_item ni;
snxtitem_all(&ni, EF_NUKE);
while (nxtitem(&ni, np)) {
if (np->nuk_own == 0)
continue;
if (np->nuk_plane == pluid)
return np->nuk_uid;
}
return -1;
}
void
nuk_oninit(void *ptr)
{

17
src/lib/subs/plnsub.c
View file

@ -1135,16 +1135,13 @@ pln_damage(struct plnstr *pp, coord x, coord y, char type, int *nukedamp,
int effective = 1;
int pinbomber = 0;
if (pp->pln_nuketype != -1) {
if (nuk_on_plane(&nuke, pp->pln_uid) >= 0) {
mpr(pp->pln_own, "Releasing RV's for %s detonation...\n",
pp->pln_flags & PLN_AIRBURST ? "airburst" : "groundburst");
pp->pln_nuketype = -1;
*nukedamp = detonate(&nuke, x, y,
pp->pln_flags & PLN_AIRBURST);
return 0;
}
CANT_REACH();
if (getnuke(nuk_on_plane(pp), &nuke)) {
mpr(pp->pln_own, "Releasing RV's for %s detonation...\n",
pp->pln_flags & PLN_AIRBURST ? "airburst" : "groundburst");
pp->pln_nuketype = -1;
*nukedamp = detonate(&nuke, x, y,
pp->pln_flags & PLN_AIRBURST);
return 0;
}
*nukedamp = 0;